Project file conflict merged.