Fixed problems with conflict  dialog #491
Fixed problem with scope of conflict-dialog