sorting out git rename gone wrong