so much stuff
fixed conflicts