fix syntax error from bad merge