* (bug 12553) Fixed invalid XHTML in edit conflict screen