Fixing merge glitches from file names