- Added ConflictObjectResult and ConflictResult types. - Conflict(), Conflict(object error), Conflict(ModelState modelState) added to ControllerBase.cs. Fixes #6172