Document previous merge
2 files changed