update index.md

docs/source/index.md

@@ -21,19 +21,10 @@ BiTIA is a tool that simplifies the infrastructure required to run complex bioin
 BiTIA has two components: **bitia-cli** and **bitita-runner**.
 BiTIA CLI is on the clientside and allows clients to submit tasks to the bitia server.
 BiTIA runner is on the serverside and operates the given tasks to produce results.
-<<<<<<< HEAD
-
-## **bitia-cli**
-Most users only need the `bitia-cli` tool to submit tasks.
-BiTIA CLI creates a zip file of the user input(pipeline) containing a unique hash and ships it to the server.
-
-=======
 
 ## **bitia-cli**
 Most users only need the `bitia-cli` tool to submit tasks.
 BiTIA CLI creates a zip file of the user input(pipeline) containing a unique hash and ships it to the server.
->>>>>>> c83ee47 (Edits in bitia documentation)
-
 
 [see some examples]: examples
 
@@ -58,7 +49,6 @@ If you want to learn how to use BiTIA and installation, check out the following
 </details>
 <details>
 <summary><b>INSTALLATION</b></summary>
-<<<<<<< HEAD
 
   To Install BiTIA using pip, run this command:
   ```{eval-rst}