chore: snapshot local changes before logging cleanup merge