Resolve conflicts with help ux improvements.