resolve merge conflict in CHANGES