merchant conflict