finish merge test