diff --git a/readme.md b/readme.md
index 74ac898e..00ea65fa 100644
--- a/readme.md
+++ b/readme.md
@@ -486,9 +486,6 @@ Output re-routes `Stdout` to a scrolled text box.  It's used with Async forms.
      Scale - How much to scale size of element
      Size - Size of element (width, height) in characters
 
-> Scale - How much to scale size of element
-> Size - Size of element (width, height) in characters
-
 ###  Input Elements
   These make up the majority of the form definition.  Optional variables at the Element level override the Form level values (e.g. `Size` is specified in the Element).  All input Elements create an entry in the list of return values.  A Text Input Element creates a string in the list of items returned.
 
@@ -501,20 +498,12 @@ Output re-routes `Stdout` to a scrolled text box.  It's used with Async forms.
                     Scale=(None, None),
                     Size=(None, None),
                     AutoSizeText=None)
-<<<<<<< HEAD
 .
 
      DefaultText - Text initially shown in the input box
      Scale - Amount size is scaled by
      Size - (width, height) of element in characters
      AutoSizeText - Bool.  True is element should be sized to fit text
-=======
-
-> DefaultText - Text initially shown in the input box
-> Scale - Amount size is scaled by
-> Size - (width, height) of element in characters
-> AutoSizeText - Bool.  True is element should be sized to fit text
->>>>>>> caad84a674b8248c518e707c8f8cc87a7b30664e
 
 Shorthand functions that are equivalent to `InputText` are `Input` and `In`
 
@@ -537,11 +526,6 @@ Also known as a drop-down list.  Only required parameter is the list of choices.
      Size - (width, height) of element in characters
      AutoSizeText - Bool. True if size should fit the text length
 
-> Values  Choices to be displayed. List of strings
-> Scale - Amount to scale size by
->  Size - (width, height) of element in characters
->  AutoSizeText - Bool. True if size should fit the text length
-
 #### Radio Button Element
 Creates one radio button that is assigned to a group of radio buttons.  Only 1 of the buttons in the group can be selected at any one time.
 
@@ -557,7 +541,6 @@ Creates one radio button that is assigned to a group of radio buttons.  Only 1 o
            AutoSizeText=None,
            Font=None)
 
-<<<<<<< HEAD
 .
 
      Text - Text to display next to button
@@ -569,16 +552,7 @@ Creates one radio button that is assigned to a group of radio buttons.  Only 1 o
      Font - Font type and size for text display
 
 
-=======
->>>>>>> caad84a674b8248c518e707c8f8cc87a7b30664e
 
-> Text - Text to display next to button
-> GroupID - Variable to groups together multiple Radio Buttons. Can be any value
-> Default - Bool.  Initial state
-> Scale - Amount to scale size of element
-> Size - (width, height) size of element in characters
-> AutoSizeText - Bool.  True if should size width to fit text
-> Font - Font type and size for text display
 
 #### Checkbox Element
 #### Spin Element