fixed conflicts from last commit