fix syntax error introduced during merge