fixed some weird merging bug or something

idk wtf, but I sorta fixed it so this contains no errors from teh last
commit and all the right shit from the commit before