merge conflicts in a file that doesnt even
merge conflicts