shop sizer not finished
conflict fixed
fix routes bug