trying to resolve merge conflict in project file