Readme.md fixes

Signed-off-by: shivamcandela <shivam.thakur@candelatech.com>

README.md

@@ -54,7 +54,7 @@ pip3 install paramiko
 pip3 install xlsxwriter
 
 
-STEP 4 
+STEP 3 
 
 Lets Install Controller Libraries, follow below steps:
 
@@ -65,13 +65,13 @@ echo "extra-index-url = https://tip-read:tip-read@tip.jfrog.io/artifactory/api/p
 echo "tip-wlan-cloud" > ~/.pip/requirements.txt
 pip3 install -r ~/.pip/requirements.txt
 
-STEP 5
+STEP 4
 
 Setup configuration.py file
 This file is autogenerated by Quali-Lab-Orchestration
 You can custom create the configuration file, by following the sample configuration data structure (tests/configuration.py)
 
-STEP 6
+STEP 5
 
 You are all set,
 
@@ -91,6 +91,16 @@ email: shivam.thakur@candelatech.com
 
 
 
+<<<<<<< HEAD
+=======
+1. number == NOLA testbed number this cloud controller is assigned to
+2. version == docker images version to use with this particular deployment. supports 3 options:
+  1. "%arbitrary_text%" - will use `%arbitrary_text%` images
+  2. "" - will use `1.0.0-SNAPSHOT-yyyy-mm-dd` images from yesterdays date
+ 
+## Motivation
+Automate Automate and Automate!
+>>>>>>> master
 
 ## Build status
 *WIP*