Cleaned up Github's merges

Fixed buildtime errors by cleaning up Github's merge stubs that were
left in the MobMagic class file. Everything works now :)