diff --git a/README.md b/README.md
index e05a94a..b3bcc58 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,11 @@ Don't ask me why i did it (._.).
 - Shutdown your device
 - Lock your device 
 - Take screenshot
+<<<<<<< HEAD
 - Channge password ofyour device
+=======
+- Channge password of your device
+>>>>>>> 4860f714f8624dd23cdae7a192f4ff80e55580ed
 - webshell
 - geo information
 - More features coming
diff --git a/core/version.py b/core/version.py
index e85355a..0f5172e 100644
--- a/core/version.py
+++ b/core/version.py
@@ -16,4 +16,4 @@ def __init__(self):
     def IsUpdated(self):
         if self.currentVersion == self.updatedVersion:
             return True
-        return False
\ No newline at end of file
+        return False
diff --git a/requirements.txt b/requirements.txt
index d319f45..4001fbc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,8 @@ opencv-python
 pyngrok
 waitress
 bs4
-requests
\ No newline at end of file
+<<<<<<< HEAD
+requests
+=======
+requests
+>>>>>>> 4860f714f8624dd23cdae7a192f4ff80e55580ed