fixed trusted shops merged new features