variants for lb03
conflict resolve