correct merge error on project file.