resolved a conflict from merge