Fixed weird git stuff
Fixed yet more weird git stuff