fixed conflicts from merge #6