Forgot to add a brace while fixing the conflict