redo after git crush