Fixed some bad merging!

wow, merging sucks… or at least im not good at it!