diff --git a/cli_meter.py b/cli_meter.py
index 03a2bb3..f1ee85f 100755
--- a/cli_meter.py
+++ b/cli_meter.py
@@ -50,8 +50,6 @@ def get_api_url():
 
 api_url = get_api_url()
 
->>>>>>> origin/fact2temp
-
 def discharge():
     GPIO.setup(a_pin, GPIO.IN)
     GPIO.setup(b_pin, GPIO.OUT)