fixed conflicts

fixed conflicts