Forgot to fully resolve the conflict