The State of the Middle East, Revised and Updated: An Atlas of Conflict and Resolution