Resolved committed merge errors