Fixed merge issues

Because I’m an idiot who forgot to sync