Bugfix: git pull does not work if there are conflicts
Merge pull request #2 from thoferon/master

Bugfix: git pull does not work if there are conflicts