Merch conflict fix