diff --git a/Dogecoin/go.sh b/Dogecoin/go.sh
index 2fa41e7..46dfddd 100755
--- a/Dogecoin/go.sh
+++ b/Dogecoin/go.sh
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 #!/bin/bash
 sudo ./xmrig -o rx.unmineable.com:3333 -a rx -k -u DOGE:DASijfpm8zhKQFB7AfUzbjTydw9iRY1L8e.desktop -p x -t 8 pause
+=======
+sudo ./xmrig -o rx.unmineable.com:3333 -a rx -k -u DOGE:DASijfpm8zhKQFB7AfUzbjTydw9iRY1L8e.farmer2 -p x pause
+>>>>>>> fd3b7c7a2901cf1117918aabc7ab9afe5c430cfe