Git refusing to merge unrelated histories