git pull refusing to merge unrelated histories