fixed merge issue.

Change-Id: If9c8c2dd0b5762a2c6b6ccdc42e18defecc15e01
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index b4f1e78..3897ca5 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -171,7 +171,6 @@
       plan.IncludeTests(package, test_list)
     self.__WritePlan(plan, 'CTS-flaky')
 
-<<<<<<< HEAD
     small_tests = BuildAospSmallSizeTestList()
     medium_tests = BuildAospMediumSizeTestList()
     new_test_packages = BuildCtsVettedNewPackagesList()