fixed shit
fixed merge conflicts