merge: Conflicts decision are not properly applied in case of insertion

In case of insertion of two conflicting values, applying the "previous" decision should only prevent the value to be inserted in current or next, and shouldn't impact the commons elements.