removed unused code
fixed conflicts