diff --git a/readme.md b/readme.md
index db56afe..59733a4 100644
--- a/readme.md
+++ b/readme.md
@@ -5,7 +5,7 @@ SSB/Ğ1 tip
 - It runs on SSB instead of the centralized web
 - It uses a libre currency (Ğ1) instead of a private one
 
-![SSB/Ğ1 tip logo](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/dev-boris/doc/ssb-g1-tip-logo.png)
+![SSB/Ğ1 tip logo](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/master/doc/ssb-g1-tip-logo.png)
 
 ## An SSB user sent you Ğ1? Here is how to claim it:
 
@@ -20,11 +20,11 @@ Then, all you need to do is connect to a Duniter client, like [Cesium](https://c
 
 On Cesium homescreen, click "**Other methods**" and choose "**Keychain file**" : 
 
-![Cesium authentification](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/dev-boris/doc/cesium-other-methods-800.png)
+![Cesium authentification](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/master/doc/cesium-other-methods-800.png)
 
 Then, browse your filesystem to select your Duniter secret key stored in ~/.ssb/secret.dunikey :
 
-![Cesium log with keychain file](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/dev-boris/doc/cesium-dunikey-800.png)
+![Cesium log with keychain file](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/master/doc/cesium-dunikey-800.png)
 
 
 ## You too want to send tips?
@@ -48,7 +48,7 @@ Then, once every other week, you can use the `tip.sh` script :
 
 It will also generate one or two markdown formatted files to help you thank publicly your fellow butts, and make them aware you sent them a tip 😉
 
-![](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/dev-boris/doc/tip.gif)
+![](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/master/doc/tip.gif)
 
 
 ## Other ways to spend your Ğ1
@@ -83,7 +83,7 @@ It runs on [the Duniter blockchain engine](https://duniter.org/).
 
 The main clients for Duniter are [Cesium](https://cesium.app/) and [Silkaj](https://mystifying-nobel-66ae54.netlify.com/)
 
-![](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/dev-boris/doc/value-fields.png)
+![](https://git.p2p.legal/axiom-team/ssb-g1-tip/raw/master/doc/value-fields.png)
 
 
 ## Authors
diff --git a/tip.sh b/tip.sh
index e4ca314..304bfc0 100755
--- a/tip.sh
+++ b/tip.sh
@@ -1,11 +1,18 @@
 #!/bin/bash
 ################################################################################
+#
 # Authors:
+#
 # [@cel](@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519)
 # [@Fred](@9BbJwPDjcyIqrOUPNn0nJZBduWdIrpMk3Cjz5MP361s=.ed25519)
 # [@Boris](@l5nYExWYIgDLV6BYHOJPoI97jIUyTdSm8CTLpQ0XeOg=.ed25519)
+# [@poka](@vDQif9KU3T78XJx+NliK+wdo1vmehHZCWqD+3X700Uk=.ed25519)
+# @[chamalow](@qio8/4L4vnzq3qRD0dqKI7sTpey54u8ZWbaICfpJOZw=.ed25519)
+#
 # Version: 1.0
+#
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
+#
 ###########################################################################################
 # PREVENT DOUBLE PAYEMENT
 # ADD Ğ1 Layer 10 LOVE to message writer you like !
@@ -30,10 +37,7 @@ 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
@@ -329,7 +333,7 @@ tyPosts[0]+="# I tipped you for your posts!\n\n"
 tyPosts[0]+=$(printf "Huge thanks to the ScuttleButt community for all the fascinating posts you allowed me to read in the past %s days." "$days_from_last_tx")
 tyPosts[0]+="\n\nAs a means to thank you further, I have just sent you #Ğ1 libre money.\n\n"
 tyPosts[0]+="These messages, though they might feel spammy (sorry) are also a way for the Ğ1 community to spread awareness about [libre currencies](https://libre-currency.org/) so we can build #resilience at every level.\n\n"
-tyPosts[0]+="You can learn how to spend your freshly earned money at [https://git.p2p.legal/Axiom-Team/ssb-g1like](https://git.p2p.legal/Axiom-Team/ssb-g1like)\n\n"
+tyPosts[0]+="You can learn how to spend your freshly earned money at [https://git.p2p.legal/Axiom-Team/ssb-g1-tip](https://git.p2p.legal/Axiom-Team/ssb-g1-tip)\n\n"
 tyPosts[0]+="Below is the list of SSB users whose content I liked recently, and the amount each one was given:\n\n"
 tableHeaders='| thanks to | for their posts | tip |\n'
 tableHeaders+='| --- | --- | ---- |\n'
@@ -439,7 +443,6 @@ do
 	if [[ $debugMsgMode -eq 0 ]]
 	then
 	
-<<<<<<< HEAD:tip.sh
 		if [[ $authorNum -ne 1 ]]
 		then
 			sleep 20 # DO NOT OVER CHARGE DUNITER
@@ -450,11 +453,6 @@ 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++ ))
 done