fixing merge crap merge conflict strings somehow left in master
removing more crap strings from master AHHHHHHHH