Fix merge problems

Accidently broke a bunch of stuff last commit, instead of undoing and
then redoing it, there were only actually a couple issues, so I just
fixed the conflicts by hand