diff --git a/.gitignore b/.gitignore
index 2d9d0f4..d5b1f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+<<<<<<< HEAD
 secret.txt
+=======
+secret.txt
+>>>>>>> feature/bugSheet
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/gitcheckout.png b/gitcheckout.png
new file mode 100644
index 0000000..9cde520
Binary files /dev/null and b/gitcheckout.png differ
diff --git a/todo.txt b/todo.txt
index 116d693..d7ab14e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1 +1,7 @@
 # bug sheet file added
+<<<<<<< HEAD
+=======
+The git merge command in Git is used to integrate changes from one branch into another. 
+This process combines the independent lines of development created by git branch and 
+integrates them into a single, unified branch
+>>>>>>> feature/bugSheet