cleans up after merge