Fix merge problems

I broke things