diff --git a/autonym.py b/autonym.py
index b43d12c05214b24e9a32cb28556b2068e71f80f1..11dfb3da8a03689cb6162aca1625701f818e19e2 100755
--- a/autonym.py
+++ b/autonym.py
@@ -240,12 +240,7 @@ def sendMixMsg(dest, msg, subj="subject", test=False, chain=""):
         raise MixError('Could not find mixmaster binary.')
 
 
-<<<<<<< HEAD
-
 def writeMessage(subject="", recipient="", text="", test=0):
-=======
-def writeMessage():
->>>>>>> master
     """
     Create a message to be sent from nym
     The message has to be sent through a remailer chain
@@ -255,7 +250,6 @@ def writeMessage():
         config['last_message'] = "ERROR - select your nym, actual selection HAS NOT a secret key"
         menu()
 
-<<<<<<< HEAD
     if subject == "":
         while True:
             subject = askSomething('Insert message subject: ')
@@ -268,7 +262,6 @@ def writeMessage():
 
     if recipient == "":
         recipient = raw_input("Insert recipient email address or newsgroup name: ")
-=======
     while True:
         subject = askSomething('Insert message subject: ')
         if isAscii(subject):
@@ -279,7 +272,19 @@ def writeMessage():
             continue
 
     recipient = raw_input("Insert recipient email address or newsgroup name: ")
->>>>>>> master
+
+    if subject == "":
+        while True:
+            subject = askSomething('Insert message subject: ')
+            if isAscii(subject):
+                break
+            else:
+                print "ERROR: subject contains not ascii characters, try again"
+                pressKey()
+                continue
+
+    if recipient == "":
+        recipient = raw_input("Insert recipient email address or newsgroup name: ")
 
     if text == "":
         if X_is_running():
@@ -328,21 +333,7 @@ def modifyConfig():
     pass
 
 
-<<<<<<< HEAD
 def chooseChain(chain=""):
-=======
-if checks.OptionsCheck(config) is True:
-    config['last_message'] = "OK, initial check passed"
-
-if not nyms.sections:
-    print "No nyms configured, going to create it..."
-    createNym()
-else:
-    setActiveNym(nyms.sections[0])
-
-
-def chooseChain():
->>>>>>> master
     """ Print remailer list and prompt for chain choice """
     if chain != "":
         config['remailer_chain'] = [chain]