Conflict resolution of commits.