cleanup after merge