final shit
fixed conflicts