fix syntax errors after rebase