Conflict Resolution Smarts