Hopefully back to normal

I hate git's merge