Bugfix: git pull does not work if there are conflicts