Forgot to do the actual merge