changed things
fixed conflicts