shops package changes to reflect changes made in merge