conflicts from merge