did some stuff
fixed conflicts