Fix merge conflicts
Merge pull request #105 from jarmokortetjarvi/backend

Fix merge conflicts