another conflict

<div class="product-sku-price js-sku-wrapper{{#defaultSku.PRICE2}} has-sale{{/defaultSku.PRICE2}}">
  {{# globals.variables.show_unit_price }}
    {{# globals.t.product.product_pp_multiplier }}
      <span class="product-points">{{{ globals.t.product.product_pp_earn }}} <span class="js-pure-privilege" data-price="{{defaultSku.formattedPrice}}"></span>
      </span>
    {{/ globals.t.product.product_pp_multiplier }}
    <span class="product-sku-price__value js-sku-price" data-product-id="{{ PRODUCT_ID }}" data-sku-id="{{ defaultSku.SKU_ID }}" data-sku-price="{{ defaultSku.formattedUnitPrice }}">{{{ defaultSku.formattedUnitPrice }}}</span>
  {{/ globals.variables.show_unit_price }}

  {{# globals.variables.show_untaxed_price }}
    {{{ globals.t.product.price_without_tax }}}
    {{#defaultSku.PRICE2}}
      <span class="product-sku-price2__value">{{{ defaultSku.formattedPrice2 }}}</span>
    {{/defaultSku.PRICE2}}
    <span class="product-sku-price__value js-sku-price" data-product-id="{{ PRODUCT_ID }}" data-sku-id="{{ defaultSku.SKU_ID }}" data-sku-price="{{ defaultSku.formattedPrice }}">{{ defaultSku.formattedPrice }}</span>
    <br/>
    {{# globals.t.product.product_pp_multiplier }}
      <span class="product-points">{{{ globals.t.product.product_pp_earn }}} <span class="js-pure-privilege" data-price="{{defaultSku.formattedPrice}}"></span>
      </span>
    {{/ globals.t.product.product_pp_multiplier }}
    {{{ globals.t.product.price_with_tax }}} <span class="js-sku-taxed-price" data-product-id="{{ PRODUCT_ID }}" data-sku-id="{{ defaultSku.SKU_ID }}" data-sku-price="{{ defaultSku.formattedTaxedPrice }}">{{ defaultSku.formattedTaxedPrice }}</span>
  {{/globals.variables.show_untaxed_price}}

  {{^ globals.variables.show_untaxed_price }}
    {{^ globals.variables.show_unit_price }}
      {{# globals.t.product.product_pp_multiplier }}
        <span class="product-points">{{{ globals.t.product.product_pp_earn }}} <span class="js-pure-privilege" data-price="{{defaultSku.formattedPrice}}"></span>
        </span>
      {{/ globals.t.product.product_pp_multiplier }}
      {{#defaultSku.PRICE2}}
        <span class="product-sku-price2__value">{{{ defaultSku.formattedPrice2 }}}</span>
      {{/defaultSku.PRICE2}}
      <span class="product-sku-price__value js-sku-price" data-product-id="{{ PRODUCT_ID }}" data-sku-id="{{ defaultSku.SKU_ID }}" data-sku-price="{{ defaultSku.formattedPrice }}">{{{ defaultSku.formattedPrice }}}</span>
    {{/ globals.variables.show_unit_price }}
  {{/ globals.variables.show_untaxed_price }}
<<<<<<< HEAD

  {{# globals.variables.show_untaxed_price }}
    {{^ globals.variables.show_unit_price }}
      {{# globals.t.product.product_pp_multiplier }}
        <span class="product-points">{{{ globals.t.product.product_pp_earn }}} <span class="js-pure-privilege" data-price="{{defaultSku.formattedPrice}}"></span>
        </span>
      {{/ globals.t.product.product_pp_multiplier }}
      {{#defaultSku.PRICE2}}
        <span class="product-sku-price2__value">{{{ defaultSku.formattedPrice2 }}}</span>
      {{/defaultSku.PRICE2}}
      <span class="product-sku-price__value js-sku-price" data-product-id="{{ PRODUCT_ID }}" data-sku-id="{{ defaultSku.SKU_ID }}" data-sku-price="{{ defaultSku.formattedPrice }}">{{{ globals.t.product.price_with_tax }}} {{& defaultSku.formattedTaxedPrice }} ({{{ globals.t.product.price_without_tax }}} {{& defaultSku.formattedPrice }})</span>
    {{/ globals.variables.show_unit_price }}
  {{/ globals.variables.show_untaxed_price }}
=======
>>>>>>> origin/master-topic-av-hk-coresite
</div>