Fixed merged code

You n00bs broke EVERYTHING with your dodgy Merges!!! I had to fix it
ALL!