diff --git a/sbotc b/sbotc
deleted file mode 160000
index f1337ff..0000000
--- a/sbotc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1337fffb2467ae35d1e694221cd0fd9ba97923f
diff --git a/tip.sh b/tip.sh
index ecacc95..e4ca314 100755
--- a/tip.sh
+++ b/tip.sh
@@ -30,6 +30,10 @@ g1priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
 # SSB pubkey
 ssbpub=$(cat ~/.ssb/secret | grep public\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
 
+<<<<<<< HEAD:tip.sh
+=======
+defaultAmountPerLikeInUD="0.1"
+>>>>>>> 9dfe107553ab39d03876beee03d5b515ca79f3f4:process-likes-g1tx.sh
 bold=$(tput bold)
 normal=$(tput sgr0)
 ssbMaxSize=8192
@@ -435,6 +439,7 @@ do
 	if [[ $debugMsgMode -eq 0 ]]
 	then
 	
+<<<<<<< HEAD:tip.sh
 		if [[ $authorNum -ne 1 ]]
 		then
 			sleep 20 # DO NOT OVER CHARGE DUNITER
@@ -445,6 +450,10 @@ do
 		
 		printf "\n${bold}%s UDĞ1${normal} sent to %s!\n\n" "$tipAmount" "$author_name" 
 	fi
+=======
+	#printf '%s\n' "silkaj -af --file ~/.ssb/secret.dunikey tx --output $g1_author --amountUD $author_amount --comment "Thx for your cool posts on ScuttleButt"
+	silkaj -p "$duniter_server" -af --file ~/.ssb/secret.dunikey tx --output $g1_author --amountUD $author_amount --comment "Thx for your cool posts on ScuttleButt" -y 2>/dev/null
+>>>>>>> 9dfe107553ab39d03876beee03d5b515ca79f3f4:process-likes-g1tx.sh
 	
 	
 	(( authorNum++ ))