update portfolio rollover
merge resolve