fixed merge, variant picker directive