A couple users have had trouble checking out. I cannot duplicate the problem so I am posting here.
What happens is they go throught the whole checkout process and then on the order complete page they get
>>>>>>>
Order complete
Your order is complete!
Thank you for shopping at !site. Your current order has been attached to the account we found matching your e-mail address.
Click here to login and view your current order status and order history. Remember to login when you make your next purchase for a faster checkout experience!
Click to return to the front page.
>>>>>>>
When I return to My Account, I still have 5 points and no files.
This is totally weird because I have anoymous checkout turned off and when I tried to checkout without logging in the system wouldn't let me. So it seems the user must be logged in, but when they checkout it is getting messed up.
Could this have something to do with cookies not being enabled by the user or some such?