Conflict commit A