merch conflict