Update to latest opt-merger