added some merge conflicts
THIS DUDE NAMED MICHAEL USED TO RIDE MOTORCYCLES
fixed merged conflixts AGIAN