Try to untangle git damage