Conflict merge error.