some refinements and completed reset scenario
logs
conflicts