Previous HEAD position was d4d47e5379... offlineimap: update 7.1.1_1 bottle.
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 1 and 84753 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

The error seems like a conflict between two commits of different contributors.
But I have no idea where this conflict is and how to fix it.