solving some problems with git