Forgot to fix schema conflicts