Update README.md

Author: Tinker Twins

README.md

@@ -6,6 +6,7 @@
 AutoDRIVE Devkit is a developer's kit that enables the users to exploit AutoDRIVE Simulator or AutoDRIVE Testbed for rapid and flexible development of autonomy algorithms. Although the platform is primarily targeted towards autonomous driving, it also supports the development of smart-city solutions for managing the traffic flow.
 </p>
 
+<<<<<<< HEAD
 AutoDRIVE Devkit consists of the following software components:
 
 - [Autonomous Driving Software Stack (ADSS) Toolkit](https://github.com/Tinker-Twins/AutoDRIVE/tree/AutoDRIVE-Devkit/ADSS%20Toolkit)
@@ -17,3 +18,6 @@ AutoDRIVE Devkit consists of the following software components:
   - [SCM Server](https://github.com/Tinker-Twins/AutoDRIVE/tree/AutoDRIVE-Devkit/SCSS%20Toolkit/autodrive_scm)
   - [SCM Database](https://github.com/Tinker-Twins/AutoDRIVE/tree/AutoDRIVE-Devkit/SCSS%20Toolkit/autodrive_scm)
   - [SCM Webapp](https://github.com/Tinker-Twins/AutoDRIVE/tree/AutoDRIVE-Devkit/SCSS%20Toolkit/autodrive_scm)
+=======
+_**Note:** This version of AutoDRIVE DevKit has been tested with [AutoDRIVE Simulator v0.1.0](https://github.com/Tinker-Twins/AutoDRIVE/releases/tag/Simulator-0.1.0) only, since AutoDRIVE Testbed is currently under development._
+>>>>>>> parent of bf007ba... Update README.md