Fixed some shit
fixed merge