deleted stuff
fixed conflicts