updated things
fixed conflicts