git troubles solution