fixing git's mistakes