actually finish merge...