Amazon and Visa bury the hatchet over credit card fees battle