Improve Conflict Check