Finish merge