removed conflict from merge