diff --git a/README.md b/README.md
index b43da46..086492d 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,8 @@ Repository containing content for the Summer of Tech Git 101 session.
 
 Check out *SoT - Source Control 101 with GitHub April 2016.pdf* for the slides used during the workshop.
 
-Dane Jarvie
\ No newline at end of file
+<<<<<<< HEAD
+Changes done by Alex Izmaylov
+=======
+Dane Jarvie
+>>>>>>> 7bfdcebc58b20c205028d722c3ebd7fb4bb550dc