Fixing syntax error from rebase