improve asthetics of resolve conflicts dialog