fixed conflicts from merge