finish softmanage
merge