Solving problems with git