Fix conflicts from merge