new files and setup_merchant script