fixed merge conflict on project file