Fix syntax error due to merge