merge branches

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index eed62fa607605f0927732ae7d453c2d7e668b28f,f5da0dac024815de9ec1045860617668bced9c06..f0dd1d0ee74db155dcf14ea361ed1972e4d661f4
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@@ -1214,14 -1213,12 +1214,15 @@@ public class TransientDescriptionServic
      }
  
      /* (non-Javadoc)
 -     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescription(java.util.UUID, java.util.UUID)
 +     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
       */
      @Override
 -    public UpdateResult moveTaxonDescription(UUID arg0, UUID arg1) {
 +    public List<DescriptionBase> merge(List<DescriptionBase> arg0, boolean arg1) {
  
 -        return defaultService.moveTaxonDescription(arg0, arg1);
 +        return defaultService.merge(arg0, arg1);
      }
  
 +
 +
++
  }

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index b9d7b8a0b9c444e345430dc463ca32a8d9f7924c,d7901d400c7330b5ebb7e9189783043edf0e6b37..869801d2abca7765b2823fd6906cf1b045b77616
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@@ -169,13 -169,10 +169,13 @@@ public class TaxonNodeDetailElement ext
  
  
                } else if (eventSource == selection_reuseExistingName) {
- 
-                       boolean enabled = selection_reuseExistingName.getEntity() == null;
 -                      boolean enabled = selection_reuseExistingName.getEntity() == null ;
++                  boolean enabled = selection_reuseExistingName.getEntity() == null;
                        setTaxon(selection_reuseExistingName.getEntity());
                        selection_reuseExistingTaxon.setEnabled(enabled);
                        textNewTaxonName.setEnabled(enabled);
 +
 +                      //setTaxon(selection_reuseExistingName.getEntity());
++
                        complete = !textNewTaxonName.getText().isEmpty();
                } else if (eventSource == textNewTaxonName) {
                        boolean enabled = CdmUtils.isBlank(textNewTaxonName.getText());