resolve a git problem