a battle with git is something usuall