fixing git's mess