merge: wrong management of insertion conflicts

When merging the following values: abc, aibc, ajbc
A conflict is properly detected, but the fallback should be one of the versions aibc or ajbc. It shouldn't be a mix of them.