Project file fix (unresolved conflicts)