diff --git a/auto_cache.py b/auto_cache.py
index 6fa0ee7..43fe79f 100644
--- a/auto_cache.py
+++ b/auto_cache.py
@@ -6,6 +6,10 @@ import redis
 import urllib.request
 
 def queryallrecordsbydatewithtype(date: str):
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallrecordsbydatewithtype: {date}')
 
     try:
@@ -20,6 +24,10 @@ def queryallrecordsbydatewithtype(date: str):
         print("Error")
 
 def queryallrecordsbydateproperty(date: str):
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallrecordsbydateproperty: {date}')
 
     try:
@@ -35,6 +43,10 @@ def queryallrecordsbydateproperty(date: str):
         print("Error")
 
 def queryallscadarecordsbydate(date: str):
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallscadarecordsbydate: {date}')
 
     try:
@@ -45,6 +57,10 @@ def queryallscadarecordsbydate(date: str):
         print("Error")
 
 def queryallschemeallrecords(date: str):
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0132ae1a7963c6f6b2504e8d0a22f0023b9296e8
     print(f'queryallschemeallrecords: {date}')
 
     try: