fighting with git