diff --git a/requirements.txt b/requirements.txt
index 00399543..97a266d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 psutil==5.4.2
+=======
+psutil==5.3.0
+>>>>>>> origin