file.txt changed locally
merge conflict fix