Merge conflict in gem kernel with git-pull

[garrone]

And I resolved this problem of git-pull resulting in a conflicted merge
by using the commands:

$ git fetch origin
$ git reset --hard origin