Draw only new widgets on ConflictDialog, delete old ones properly
Draw only new widgets on ConflictDialog, delete old ones properly

Earthwings/marble,Earthwings/marble,Earthwings/marble,Earthwings/marble,Earthwings/marble,Earthwings/marble