removed an extra div in the html of show_conflict that was breaking the layout