Conflict commit