diff --git a/scripts/webui-rpc.py b/scripts/webui-rpc.py
index eb60ce7..c056d93 100644
--- a/scripts/webui-rpc.py
+++ b/scripts/webui-rpc.py
@@ -12,7 +12,6 @@ github_link = "https://github.com/davehornik/sd-discordRPC"
 
 enable_dynamic_status = True
 
-
 def start_rpc():
     print('[Discord-RPC]  Running Discord Rich Presence Extension by https://github.com/davehornik, version 1.0.0')
     print(f'[Discord-RPC]  Bug reporting -> {github_link}')
@@ -25,12 +24,11 @@ def start_rpc():
         run_pip("install pypresence", "pypresence")
 
     if enable_dynamic_status:
-<<<<<<< HEAD
-        print(
-            "[Discord-RPC]  Remember that it uses multithreading, so there may occur cases when the whole program freezes")
-=======
+
         print("[Discord-RPC]  Remember that it uses multithreading, so there may occur cases when the whole program freezes")
->>>>>>> 16350a398bf5fecbda0df73fc552fc423bb6893b
+
+        print("[Discord-RPC]  Remember that it uses multithreading, so there may occur cases when the whole program freezes")
+
         print("[Discord-RPC]  In such cases close the webui, go to the 'extensions' folder and remove the plugin")
 
     checkpoint_info = shared.sd_model.sd_checkpoint_info
@@ -50,59 +48,13 @@ def start_rpc():
         large_image="unknown" if enable_dynamic_status else "auto",
         start=time_c
     )
-
-<<<<<<< HEAD
     state_watcher = threading.Thread(target=state_watcher_thread, args=(rpc,), daemon=True)
     state_watcher.start()
 
     if enable_dynamic_status:
         print(
             "[Discord-RPC]  If everyhing is okey, it should be working already. Make sure u got Game Activity enabled in Discord.")
-=======
-#    def RPC_thread(rpc):
-#        print('[Discord-RPC]  RPC thread on bg starting')
-#        while True:
-#            rpc.update()
 
-    def state_watcher_thread():
-        reset_time = False
-        while True:
-
-            checkpoint_info = shared.sd_model.sd_checkpoint_info
-            model_name = os.path.basename(checkpoint_info.filename)
-            if shared.state.job_count == 0:
-                if reset_time == False:
-                    time_c = time.time()
-                    reset_time= True
-
-                rpc.update(large_image="a1111", details=model_name,
-                           state="Idle", start=time_c)
-            else:
-                if reset_time == True:
-                    time_c = time.time()
-                    reset_time= False
-
-                rpc.update(large_image="a1111_gen", details=model_name,
-                           state=f'Total batch of {shared.state.job_count*get_batch_size()} image/s', start=time_c)
-            time.sleep(2)  # update once per two seconds
-            #print(get_batch_size())
-
-#    rpc_watcher = threading.Thread(target=RPC_thread, args=(rpc,), daemon=True)
-    state_watcher = threading.Thread(target=state_watcher_thread, daemon=True)
-    state_watcher.start()
-#    rpc_watcher.start()
-
-    if enable_dynamic_status:
-        print("[Discord-RPC]  If everyhing is okey, it should be working already. Make sure u got Game Activity enabled in Discord.")
->>>>>>> 16350a398bf5fecbda0df73fc552fc423bb6893b
-
-
-def on_ui_tabs():
-    start_rpc()
-    return []
-
-
-<<<<<<< HEAD
 def state_watcher_thread(rpc):
     reset_time = False
     batch_size_r = False
@@ -121,6 +73,7 @@ def state_watcher_thread(rpc):
             if batch_size_r == True:
                 batch_size_r = False
                 batch_size = 0
+
             rpc.update(large_image="a1111", details=model_name,
                        state="Idle", start=time_c)
         else:
@@ -133,13 +86,13 @@ def state_watcher_thread(rpc):
                 if batch_size != 0:
                     batch_size_r = True
             rpc.update(large_image="a1111_gen", details=model_name,
-                       state=f'Total batch of {shared.state.job_count*batch_size} image/s', start=time_c)
+                       state=f'Total batch of {shared.state.job_count * batch_size} image/s', start=time_c)
 
         time.sleep(2)  # update once per two seconds
 
-
-script_callbacks.on_ui_tabs(on_ui_tabs)
-
+def on_ui_tabs():
+    start_rpc()
+    return []
 
 def get_batch_size():
 
@@ -149,6 +102,6 @@ def get_batch_size():
         return x
     else:
         return 0
-=======
+
 script_callbacks.on_ui_tabs(on_ui_tabs)
->>>>>>> 16350a398bf5fecbda0df73fc552fc423bb6893b
+