Resolved conflicts found during merge