Conflict resolved?