Conflict code shouldn't be in here.