fix uni delete and merge conflict