Conflict and Surprise: Heuristics for Model Revision