Fixed Bad Merge...

Kind of defeats the purpose of a merge if they're always 'bad'