Fix syntax error from bad merge