trying to solve a git problem