diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
index 6cec49314..9489c8c1e 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvopt
@@ -490,11 +490,7 @@
 
   <Group>
     <GroupName>CyaSSL Apps</GroupName>
-<<<<<<< HEAD
     <tvExp>0</tvExp>
-=======
-    <tvExp>1</tvExp>
->>>>>>> cyassl/master
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -618,13 +614,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-<<<<<<< HEAD
       <TopLine>135</TopLine>
       <CurrentLine>149</CurrentLine>
-=======
-      <TopLine>209</TopLine>
-      <CurrentLine>220</CurrentLine>
->>>>>>> cyassl/master
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -771,11 +762,7 @@
 
   <Group>
     <GroupName>MDK-ARM</GroupName>
-<<<<<<< HEAD
     <tvExp>0</tvExp>
-=======
-    <tvExp>1</tvExp>
->>>>>>> cyassl/master
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -787,13 +774,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-<<<<<<< HEAD
       <TopLine>39</TopLine>
       <CurrentLine>73</CurrentLine>
-=======
-      <TopLine>42</TopLine>
-      <CurrentLine>66</CurrentLine>
->>>>>>> cyassl/master
       <bDave2>0</bDave2>
       <PathWithFileName>c:\Keil\ARM\Boards\Keil\MCBSTM32F200\RL\FlashFS\SD_File\Serial.c</PathWithFileName>
       <FilenameWithoutPath>Serial.c</FilenameWithoutPath>
@@ -916,11 +898,7 @@
 
   <Group>
     <GroupName>CyaSSL Library</GroupName>
-<<<<<<< HEAD
     <tvExp>0</tvExp>
-=======
-    <tvExp>1</tvExp>
->>>>>>> cyassl/master
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1072,11 +1050,7 @@
 
   <Group>
     <GroupName>Crypt/Cipher Library</GroupName>
-<<<<<<< HEAD
     <tvExp>0</tvExp>
-=======
-    <tvExp>1</tvExp>
->>>>>>> cyassl/master
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1454,17 +1428,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-<<<<<<< HEAD
       <ColumnNumber>30</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
       <TopLine>560</TopLine>
       <CurrentLine>570</CurrentLine>
-=======
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
->>>>>>> cyassl/master
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\ctaocrypt\src\random.c</PathWithFileName>
       <FilenameWithoutPath>random.c</FilenameWithoutPath>
@@ -1479,13 +1446,8 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-<<<<<<< HEAD
       <TopLine>1</TopLine>
       <CurrentLine>1</CurrentLine>
-=======
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
->>>>>>> cyassl/master
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\ctaocrypt\src\ripemd.c</PathWithFileName>
       <FilenameWithoutPath>ripemd.c</FilenameWithoutPath>
@@ -1720,11 +1682,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-<<<<<<< HEAD
       <TopLine>163</TopLine>
-=======
-      <TopLine>165</TopLine>
->>>>>>> cyassl/master
       <CurrentLine>169</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\config\startup_stm32f2xx.s</PathWithFileName>
@@ -1744,11 +1702,7 @@
       <GroupNumber>7</GroupNumber>
       <FileNumber>73</FileNumber>
       <FileType>1</FileType>
-<<<<<<< HEAD
       <tvExp>0</tvExp>
-=======
-      <tvExp>1</tvExp>
->>>>>>> cyassl/master
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1764,46 +1718,18 @@
       <GroupNumber>7</GroupNumber>
       <FileNumber>74</FileNumber>
       <FileType>1</FileType>
-<<<<<<< HEAD
       <tvExp>0</tvExp>
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
       <TopLine>51</TopLine>
       <CurrentLine>57</CurrentLine>
-=======
-      <tvExp>1</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>52</TopLine>
-      <CurrentLine>56</CurrentLine>
->>>>>>> cyassl/master
       <bDave2>0</bDave2>
       <PathWithFileName>..\MDK-ARM\CyaSSL\Retarget.c</PathWithFileName>
       <FilenameWithoutPath>Retarget.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-<<<<<<< HEAD
-    <File>
-      <GroupNumber>7</GroupNumber>
-      <FileNumber>75</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <Focus>0</Focus>
-      <ColumnNumber>0</ColumnNumber>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>0</TopLine>
-      <CurrentLine>0</CurrentLine>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</PathWithFileName>
-      <FilenameWithoutPath>time-STM32F2xx.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-=======
->>>>>>> cyassl/master
   </Group>
 
 </ProjectOpt>
diff --git a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
index 759667845..222ef456f 100644
--- a/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
+++ b/IDE/MDK-ARM/Projects/MDK-ARM-STM32F2xx.uvproj
@@ -44,11 +44,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-RTX-TCP-FS\</OutputDirectory>
-<<<<<<< HEAD
           <OutputName>STM32F2xx-MDK-RTX-TCP-FS</OutputName>
-=======
-          <OutputName>MDK-RTX-TCP-FS</OutputName>
->>>>>>> cyassl/master
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -353,11 +349,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-<<<<<<< HEAD
               <Define>HAVE_CONFIG_H CYASSL_STM32F2xx __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
-=======
-              <Define>HAVE_CONFIG_H __DBG_ITM __RTX USE_STDPERIPH_DRIVER MDK_CONF_RTX_TCP_FS</Define>
->>>>>>> cyassl/master
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;C:..\STM32F2xx_StdPeriph_Lib\inc;..\..\..\</IncludePath>
             </VariousControls>
@@ -938,14 +930,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
-<<<<<<< HEAD
             <File>
               <FileName>time-STM32F2xx.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
             </File>
-=======
->>>>>>> cyassl/master
           </Files>
         </Group>
       </Groups>
@@ -988,11 +977,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-FS\</OutputDirectory>
-<<<<<<< HEAD
           <OutputName>STM32F2xx-MDK-FS</OutputName>
-=======
-          <OutputName>MDK-FS</OutputName>
->>>>>>> cyassl/master
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -1297,11 +1282,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-<<<<<<< HEAD
               <Define>HAVE_CONFIG_H  CYASSL_STM32F2xx __DBG_ITM USE_STDPERIPH_DRIVER  MDK_CONF_FS</Define>
-=======
-              <Define>HAVE_CONFIG_H  __DBG_ITM USE_STDPERIPH_DRIVER  MDK_CONF_FS</Define>
->>>>>>> cyassl/master
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX\..\..\..\</IncludePath>
             </VariousControls>
@@ -2158,14 +2139,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
-<<<<<<< HEAD
             <File>
               <FileName>time-STM32F2xx.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
             </File>
-=======
->>>>>>> cyassl/master
           </Files>
         </Group>
       </Groups>
@@ -2208,11 +2186,7 @@
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
           <OutputDirectory>.\MDK-BARE-METAL\</OutputDirectory>
-<<<<<<< HEAD
           <OutputName>STM32F2xx-MDK-BARE-METAL</OutputName>
-=======
-          <OutputName>MDK-BARE-METAL</OutputName>
->>>>>>> cyassl/master
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
@@ -2517,11 +2491,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls></MiscControls>
-<<<<<<< HEAD
               <Define>HAVE_CONFIG_H  CYASSL_STM32F2xx  __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
-=======
-              <Define>HAVE_CONFIG_H  __DBG_ITM USE_STDPERIPH_DRIVER MDK_CONF_BARE_METAL</Define>
->>>>>>> cyassl/master
               <Undefine></Undefine>
               <IncludePath>..\MDK-ARM\CyaSSL;..\MDK-ARM\inc;..\STM32F2xx_StdPeriph_Lib\inc;..\POSIX;..\..\..\</IncludePath>
             </VariousControls>
@@ -3596,14 +3566,11 @@
               <FileType>1</FileType>
               <FilePath>..\MDK-ARM\CyaSSL\Retarget.c</FilePath>
             </File>
-<<<<<<< HEAD
             <File>
               <FileName>time-STM32F2xx.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\STM32F2xx_StdPeriph_Lib\time-STM32F2xx.c</FilePath>
             </File>
-=======
->>>>>>> cyassl/master
           </Files>
         </Group>
       </Groups>
diff --git a/src/internal.c b/src/internal.c
index 0cf66a8ec..fcfe8f9cc 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -9509,12 +9509,8 @@ int SetCipherList(Suites* s, const char* list)
         
         ssl->options.haveSessionId = 1;
         /* ProcessOld uses same resume code */
-<<<<<<< HEAD
-        if (ssl->options.resuming) {  /* let's try */
-=======
         if (ssl->options.resuming && (!ssl->options.dtls ||
             ssl->options.acceptState == HELLO_VERIFY_SENT)) {  /* let's try */
->>>>>>> cyassl/master
             int ret = -1;            
             CYASSL_SESSION* session = GetSession(ssl,ssl->arrays->masterSecret);
             if (!session) {