Merge changes in file with conflicts