diff --git a/install.sh b/install.sh
index 4faf9df..30dce61 100755
--- a/install.sh
+++ b/install.sh
@@ -35,10 +35,12 @@ if [[ ! $(which sbot) ]]; then
 	nvm install --lts
 	sudo apt install libtool autoconf -y
 	npm install sodium-native ssb-backlinks
-	sudo npm install -g ssb-server
-
-	echo "Adresse DNS de votre Pub SSB? hostname.yourdomain.tld"
+	npm install -g ssb-server
+    
+    nodename=$(cat /etc/hostname).local
+	echo "SSB Node Hostname (default $nodename)?"
 	read EXTERNAL
+    [[ $EXTERNAL == "" ]] && EXTERNAL=$nodename
 
 	mkdir -p ~/.ssb
 	cat > ~/.ssb/config <<EOF
@@ -144,7 +146,7 @@ if [[ $salt == "" ]]; then
 	pepper="${makeyarray[6]} ${makeyarray[7]} ${makeyarray[8]}"
 fi
 echo "........."
-echo "CREDENTIAL: $salt / $pepper"
+echo "REMEMBER YOUR CREDENTIALS: $salt / $pepper"
 
 # CREATE ~/.ssb/secret.dunikey
 python3 ./key_create_dunikey.py "$salt" "$pepper"
diff --git a/process-likes-g1tx.sh b/process-likes-g1tx.sh
index 4d5a191..edd3f05 100755
--- a/process-likes-g1tx.sh
+++ b/process-likes-g1tx.sh
@@ -147,9 +147,6 @@ do
 		#### SEND 10 LOVE = 0.1 DU to $g1_author wallet
 		silkaj -p "$duniter_server" -af --file ~/.ssb/secret.dunikey tx --output $g1_author --amountUD 0.1 --comment "_SSB:LIKE:$target_id" -y 2>/dev/null		
 		#### WRITE RESPONSE MESSAGE
-<<<<<<< HEAD
-		sbotc publish '{"type":"post","text":"Thanks for this post ; I have just sent you G1 libre money. Get code from [https://git.p2p.legal/Axiom-Team/ssb-g1like](https://git.p2p.legal/Axiom-Team/ssb-g1like). Access your wallet with [Cesium](https://cesium.app).", "branch": "'"$target_id"'", "root": "'"$root_id"'"}' 2>&1>/dev/null
-=======
 		sbotc publish '{"type":"post","text":"Thanks for this post ; I have just sent you G1 libre money. Use it with [Cesium](https://cesium.app). Get it from [https://git.p2p.legal/Axiom-Team/ssb-g1like](https://git.p2p.legal/Axiom-Team/ssb-g1like) ", "branch": "'"$target_id"'", "root": "'"$root_id"'"}' 2>&1>/dev/null
 		
 		#printf "0.1 G1UD sent to %s!\n" "$author_s_name" 
@@ -157,7 +154,6 @@ do
 		echo ""
 		echo ""
 		
->>>>>>> 8407b404a0b2257457a0a15acb1b3b17784ae8a1
 		sleep 20 # DO NOT OVER CHARGE DUNITER
 	else
 		echo "I LIKE MY MESSAGE $target_id"
@@ -169,30 +165,3 @@ do
 		exit 1
 	fi
 done
-<<<<<<< HEAD
-=======
-
-#######################################################################
-## SCAN G1 BLOCKCHAIN FOR INCOMING TX
-#######################################################################
-EVERY=1
-TIMEBEFORE=$(date --date="-$EVERY minutes" +"%s")
-TIMESTAMP=$(date +"%s")
-#log "GETTING last $EVERY mn TX : https://duniter-g1.p2p.legal/tx/history/$g1pub/times/$TIMEBEFORE/$TIMESTAMP"
-json=$(curl -s https://$duniter_server/tx/history/$g1pub/times/$TIMEBEFORE/$TIMESTAMP)
-pending_tx=$(printf %s "$json" | jq '.history.pending')
-pending_tx_comments==$(printf %s "$pending_tx" | jq '.[].comment')
-printf %s "$pending_tx_comments" > /tmp/zenfontain.g1tx.txt
-
-
-#while read txincmd
-#do
-#    export $txincmd
-#    log "$g1pub TX IN PENDING !! COMMENT = " $txincmd
-# 	
-# 	# We have to check if [].issuers.0 != $g1pub
-# 	# or else it will publish the following message each time we SEND a transaction
-#	
-#	#sbotc publish '{"type":"post","text":"I am receiving G1 on my SSB Wallet $g1pub"}'
-# done < /tmp/zenfontain.g1tx.txt
->>>>>>> 8407b404a0b2257457a0a15acb1b3b17784ae8a1