fixed conflicts
fixed merge conflicts