diff --git a/README.md b/README.md
index b103466..be0af31 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Introduction to Git and GitHub
 
 ## Simple Interest Calculator
@@ -14,3 +15,6 @@ Output
 ```
 
 _© 2022 XYZ, Inc._
+=======
+# coding-project-template
+ parent of d8324ad (Update README.md)