diff --git a/text/tools.txt b/text/tools.txt
index 485b2a1..508807c 100644
--- a/text/tools.txt
+++ b/text/tools.txt
@@ -6,11 +6,18 @@ a poem
 a statement
 a song
 a speech
+<<<<<<< HEAD
 a gesture
+=======
+a gest
+a python script
+a html script
+>>>>>>> 466c0862c7318b90b7c361923e19732feff62fc2
 a card
 a movie
 a story
 a tale
+<<<<<<< HEAD
 a pen
 a clock
 paper
@@ -22,3 +29,6 @@ a sketch
 your opposite hand
 your eyes closed
 out words
+=======
+a conflict
+>>>>>>> 466c0862c7318b90b7c361923e19732feff62fc2