2 Samuel 24:1 and 1 Chronicles 21:1 -- Contradictory?