fixed that shit
fixed merge conflicts