fight with git