I removed the merging of the pages. I now have everything as it was originally in the template. There is a separate shopping cart page and a separate checkout page. Each page has its own shortcode. Please check the links that I have already sent you.
