diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..ea11575
Binary files /dev/null and b/.DS_Store differ
diff --git a/contribution1.txt b/contribution1.txt
new file mode 100644
index 0000000..9a924a1
--- /dev/null
+++ b/contribution1.txt
@@ -0,0 +1,9 @@
+Mauris tortor ligula, vestibulum eget metus eget,
+vulputate rutrum lectus. Suspendisse ac hendrerit
+nunc. Nulla varius lectus vitae massa auctor feugiat.
+Nulla mattis lacus leo, in egestas ex eleifend vitae.
+Praesent ullamcorper eros a mauris lacinia, eu
+ullamcorper tortor dapibus. Sed eget vehicula felis.
+Donec vitae ipsum id risus condimentum consequat in a
+mi. Integer sollicitudin sit amet nunc vitae
+sollicitudin. Duis tincidunt sapien id ultrices
diff --git a/contribution2.txt b/contribution2.txt
new file mode 100644
index 0000000..6810e51
--- /dev/null
+++ b/contribution2.txt
@@ -0,0 +1,7 @@
+Nam suscipit ante nec eros consectetur pretium. Etiam
+lacinia blandit molestie. Nam pulvinar nibh elit, vel
+condimentum ante accumsan a. Vivamus tellus lectus,
+pretium nec erat id, porttitor consequat sapien.
+Pellentesque porttitor tincidunt metus. Donec vitae
+fringilla nulla. Praesent pretium mollis erat, et
+vestibulum nisi tempus a.
\ No newline at end of file
diff --git a/file2.txt b/file2.txt
index 7867bc3..d3c82c6 100644
--- a/file2.txt
+++ b/file2.txt
@@ -3,8 +3,12 @@ sollicitudin nunc, sit amet sodales leo sapien et sem.
 Maecenas mauris eros, sollicitudin at elit in,
 pellentesque
 mattis orci. Aliquam elementum finibus dictum.
+<<<<<<< HEAD
 
 CHANGED BY MAINTAINER
 
+=======
+CHANGED BY CONTRIBUTOR
+>>>>>>> ccbd94b (changing files)
 Integer ac nibh nec est porttitor semper ultrices eu
 ligula. Etiam sodales porttitor venenatis.
\ No newline at end of file
diff --git a/file3.txt b/file3.txt
index b355bc0..d6835d4 100644
--- a/file3.txt
+++ b/file3.txt
@@ -1,5 +1,12 @@
 Quisque nec lectus viverra, tempus mi molestie, posuere
 mauris. Nam iaculis ac eros eget bibendum. Phasellus
 egestas fringilla libero sed viverra.
+<<<<<<< HEAD
 
-CHANGED BY MAINTAINER
\ No newline at end of file
+CHANGED BY MAINTAINER
+=======
+Proin hendrerit convallis nibh ac gravida. Integer
+placerat
+accumsan nibh, vitae bibendum urna ullamcorper in.
+ADDED BY CONTRIBUTOR
+>>>>>>> ccbd94b (changing files)