Added Marcell's shop code for merge