fix syntax error after merge