diff --git a/main.py b/main.py
index ab09c7e..f205039 100644
--- a/main.py
+++ b/main.py
@@ -23,33 +23,6 @@ def get_namespaces():
     ns = v1.list_namespace()
     return ns
 
-<<<<<<< HEAD
-def get_tiller_namespaces():
-    command = "/usr/local/bin/kubectl get deploy --all-namespaces -l name=tiller -ojson"
-    info(f"Running command: {command}")
-    try:
-        output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8")
-    except CalledProcessError as err:
-        error(err.output.decode("utf-8"))
-        raise err
-    info(f"Output from command:\n{output}")
-    data = json.loads(output)
-    return data
-
-def get_deployments(namespace):
-    command = "/usr/local/bin/kubectl -n " + namespace + " get deploy -ojson"
-    info(f"Running command: {command}")
-    try:
-        output = check_output(command.split(" "), stderr=STDOUT).decode("utf-8")
-    except CalledProcessError as err:
-        error(err.output.decode("utf-8"))
-        raise err
-    info(f"Output from command:\n{output}")
-    data = json.loads(output)
-    return data
-
-=======
->>>>>>> a7df40eb7710553f5d0185c3fa04ea6991c06f89
 def get_charts(ns):
     command = "/usr/local/bin/helm -n " + ns + " list -ojson" #helm3
     info(f"Running command: {command}")