fixed syntax error when importing
Merge branch 'backend'