cleaning mess after automerge