shop layout applied
after merge