IPG resolves dispute with Amazon; IPG e-books return to Kindle