Resolved Merge Conflict on Project file