fix missing brace in merge conflict fix