fixing git troubles