battle with git