Fix project file after merge