Supress unmerge servant conflict