Fix syntax error caused by bad merge.