Fix syntax error
merge