Git Pull Errormerge Head