autogen crap removed

idfk where <<<<<<< head an the >>>>>>> origin/master came from but i
assume its not supposed to be there as is break everytang