Fixing what the merge did

Yes, I AM going mad