changed things
fixed conflicts
fixed conflicts