Fixed project file merge error