Updated broken project file by failed merge.