From 11b16dfd518846fc123af30ada4a40f3f381eb22 Mon Sep 17 00:00:00 2001
From: ada <>
Date: Tue, 8 Nov 2022 17:11:14 +0100
Subject: [PATCH] conflict

---
 text/tools.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/text/tools.txt b/text/tools.txt
index faf2aac..887002c 100644
--- a/text/tools.txt
+++ b/text/tools.txt
@@ -1,6 +1,6 @@
 your hand
 someone else's hand
-some1
+someone
 a drawing
 a collage
 a poem
@@ -17,4 +17,3 @@ a card
 a movie
 a story
 a tale
-my really good edit