The war, or at least the battle, between Amazon.com and Macmillan publishers (corporate parent of my publisher, Tor Books) ended Sunday night when Amazon conceded that it would have to accept the n…