Git is being a pain with merges

reverting some things that shouldn't have gone in