Fix the json

src/python/grpcio_tests/tests_aio/tests.json

@@ -16,6 +16,10 @@
   "unit.interceptor_test.TestUnaryUnaryClientInterceptor",
   "unit.metadata_test.TestMetadata",
   "unit.server_test.TestServer",
+<<<<<<< HEAD
   "unit.timeout_test.TestTimeout",
   "unit.wait_for_ready_test.TestWaitForReady"
+=======
+  "unit.timeout_test.TestTimeout"
+>>>>>>> Fix the json
 ]