Fix merge conflicts

diff --cc gui/gui_classic.py
index 056aff8,829e546..f5e92ca
--- 1/gui/gui_classic.py
--- 2/gui/gui_classic.py
+++ b/gui/gui_classic.py
@@@ -577,26 -586,15 +586,16 @@@ class ElectrumWindow(QMainWindow)
              text = unicode( item.text(column_label) )
              changed = False
  
-             if text:
-                 if text not in self.wallet.aliases.keys():
-                     old_addr = self.wallet.labels.get(text)
-                     if old_addr != addr:
-                         self.wallet.labels[addr] = text
-                         changed = True
-                         self.run_hook('label_changed',(self, addr, text))
-                 else:
-                     print_error("Error: This is one of your aliases")
-                     label = self.wallet.labels.get(addr,'')
-                     item.setText(column_label, QString(label))
+             if text in self.wallet.aliases.keys():
+                 print_error("Error: This is one of your aliases")
+                 label = self.wallet.labels.get(addr,'')
+                 item.setText(column_label, QString(label))
++
              else:
-                 s = self.wallet.labels.get(addr)
-                 if s: 
-                     self.wallet.labels.pop(addr)
-                     changed = True
- 
-             if changed:
-                 self.update_history_tab()
-                 self.update_completions()
+                 changed = self.set_label(addr, text)
+                 if changed:
+                     self.update_history_tab()
+                     self.update_completions()
                  
              self.current_item_changed(item)