removed conflicts from merge