fixes merge conflict
fixes merge conflict

renuo/spree_flexi_variants,QuintinAdam/spree_flexi_variants,jdeen/spree_flexi_variants,QuintinAdam/spree_flexi_variants,jdeen/spree_flexi_variants,renuo/spree_flexi_variants,QuintinAdam/spree_flexi_variants,renuo/spree_flexi_variants