still fighting with git