diff --git a/alex.txt b/alex.txt
new file mode 100644
index 0000000..1f3af66
--- /dev/null
+++ b/alex.txt
@@ -0,0 +1,2 @@
+Hello, my name is Alex!
+I am 24 years old.
\ No newline at end of file
diff --git a/dog.txt b/dog.txt
new file mode 100644
index 0000000..f1a2210
--- /dev/null
+++ b/dog.txt
@@ -0,0 +1 @@
+My dogs name is Mozart!
diff --git a/hello.txt b/hello.txt
index cfd2219..a658bd3 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1,2 +1,3 @@
 Hello World
 Hello Universe
+hahahahahahhaahaha
diff --git a/working.txt b/working.txt
new file mode 100644
index 0000000..f695aa5
--- /dev/null
+++ b/working.txt
@@ -0,0 +1,2 @@
+this is working!!
+let's conflict!