diff --git a/README.md b/README.md
index b103466..66b9b77 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Introduction to Git and GitHub
 
 ## Simple Interest Calculator
@@ -13,4 +14,7 @@ Output
    simple interest = p*t*r
 ```
 
-_© 2022 XYZ, Inc._
+_© 2023 XYZ, Inc._
+=======
+# coding-project-template
+>>>>>>> parent of d8324ad (Update README.md)