clean state for merge with testing