Commit (conflicts)