fixed conflicts
fix merge conflicts