modified project file from merge changes