diff --git a/ftpCommandElaborate.c b/ftpCommandElaborate.c
index 72b2b6d..900fccf 100644
--- a/ftpCommandElaborate.c
+++ b/ftpCommandElaborate.c
@@ -1137,11 +1137,7 @@ int parseCommandRnto(ftpDataType * data, int socketId)
         if (FILE_IsFile(data->clients[socketId].renameFromFile.text) == 1 ||
             FILE_IsDirectory(data->clients[socketId].renameFromFile.text) == 1)
         {
-<<<<<<< HEAD
-            returnCode = rename (theClientData->renameFromFile.text, theClientData->renameToFile.text);
-=======
             returnCode = rename (data->clients[socketId].renameFromFile.text, data->clients[socketId].renameToFile.text);
->>>>>>> TLS
             if (returnCode == 0) 
             {
             	returnCode = socketPrintf(data, socketId, "s",  "250 File successfully renamed or moved\r\n");
diff --git a/library/openSsl.c b/library/openSsl.c
index 0a92bfa..b68f08c 100644
--- a/library/openSsl.c
+++ b/library/openSsl.c
@@ -60,6 +60,7 @@ void cleanupOpenssl()
 {
 	thread_cleanup();
     EVP_cleanup();
+
 }
 
 SSL_CTX *createServerContext()