Conflict UI enhancements