diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..690bae0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+id_rsa
diff --git a/.news.txt.swp b/.news.txt.swp
new file mode 100644
index 0000000..f8db377
Binary files /dev/null and b/.news.txt.swp differ
diff --git a/README.md b/README.md
index 6d73cf2..2d035a4 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 Git Class
-simulating a push before pull
+simulating a push before pull oh
+boss what do you think?
diff --git a/hello.md b/hello.md
new file mode 100644
index 0000000..e69de29
diff --git a/iron.js b/iron.js
index 93e5a95..53d659f 100644
--- a/iron.js
+++ b/iron.js
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
+how are you?
+aji
+=======
 how una dey?
   labalaba
+>>>>>>> 0212b9ededa75fa20824ec919fb00214fad37c36
diff --git a/iron.js.3.7.26 b/iron.js.3.7.26
index 93e5a95..53d659f 100644
--- a/iron.js.3.7.26
+++ b/iron.js.3.7.26
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
+how are you?
+aji
+=======
 how una dey?
   labalaba
+>>>>>>> 0212b9ededa75fa20824ec919fb00214fad37c36
diff --git a/news.txt b/news.txt
new file mode 100644
index 0000000..aaf1f5f
--- /dev/null
+++ b/news.txt
@@ -0,0 +1,2 @@
+labalaba
+on a new branch
diff --git a/waiting.py b/waiting.py
new file mode 100644
index 0000000..e69de29