conflicts from merge corrected