merge
attachments + shopfix