Remove some things that git messed up :/