finish merge with orig