finish merge edit