Updated the readme and resolved the merge conflicts

Author: Naveen481

README.md

@@ -10,7 +10,7 @@ This repository allows you to install [Apache Airflow](https://airflow.apache.or
 
 ### Currently Supported Versions of Airflow
 - Airflow 1.9.0
-- Airflow 1.10.0
+- Airflow 1.10.3
 
 ### Currently Supported Operating Systems
 - CentOS/RHEL 6 & 7

src/scripts/stop_airflow_scheduler.sh

@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 #!/bin/bash -x
->>>>>>> 11b39ebe4b384d6ad1c1735474123e5af2c8676a
 for pid in `ps -ef | grep -v "grep" | grep "airflow scheduler" | awk '{print $2}'` ; do kill -9 $pid || true ; done