Restoring SVoIP after bad merge