resolve merge conflict in text file