diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 18c9147181..6d8745bc12 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,6 +1,18 @@
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
+<<<<<<< HEAD
+We as contributors and maintainers pledge to make participation in our project a harassment-free experience for everyone.
+
+## Our Standards
+- Use welcoming and inclusive language
+- Be respectful of differing viewpoints
+- Gracefully accept constructive criticism
+- Show empathy towards other community members
+
+## Enforcement
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the repository maintainers.
+=======
 
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
@@ -126,3 +138,4 @@ enforcement ladder](https://github.com/mozilla/diversity).
 For answers to common questions about this code of conduct, see the FAQ at
 https://www.contributor-covenant.org/faq. Translations are available at
 https://www.contributor-covenant.org/translations.
+>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8046b81b2..eac30059a6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1,20 @@
+<<<<<<< HEAD
+# Contributing Guidelines
+
+Thank you for your interest in contributing to this project!
+
+## How to Contribute
+1. Fork the repository.
+2. Create a new branch for your changes.
+3. Make your changes and commit them with a meaningful message.
+4. Push the branch and create a Pull Request.
+
+## Code Style
+- Follow standard shell scripting practices.
+- Keep code simple and readable.
+
+## Reporting Issues
+If you find a bug or have a feature request, please open an issue in the repository.
+=======
  All contributions, bug reports, bug fixes, documentation improvements, enhancements, and ideas are welcome.
+>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
diff --git a/LICENSE b/LICENSE
index 45cd6221b7..3af6c46da8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,15 @@
+<<<<<<< HEAD
+
+---
+
+## 📄 2. `LICENSE`
+When you create it on GitHub, **choose Apache License 2.0 template**.  
+If you want raw text, here’s the header (GitHub will auto-fill the rest):
+```text
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+=======
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,3 +211,4 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
diff --git a/README.md b/README.md
index b103466139..4a23431667 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,27 @@
+<<<<<<< HEAD
+# Final Project - Simple Interest Calculator
+# jbbmo-Introduction-to-Git-and-GitHub
+
+This repository is for learning Git and GitHub.
+
+This repo is created as part of the hands-on labs for the GitHub & Git CLI final project.
+# This is a sample edit for bug-fix-typo branch
+
+## Contents
+- `simple-interest.sh`: A she script that calculates simple interest.
+- `LICENSE`: Apache 2.0 License file.
+- `README.md`: Project documentation.
+- `CODE_OF_CONDUCT.md`: Contributor Code of Conduct.
+- `CONTRIBUTING.md`: Guidelines for the  contributions.
+This line was added to fix a typoerror as part of the GitHubs project task.
+## Update
+Fixed a small typo as part of the GitHub exercise.
+
+
+## How to Run the Script
+```bash
+bash simple-interest.sh
+=======
 # Introduction to Git and GitHub
 
 ## Simple Interest Calculator
@@ -14,3 +38,4 @@ Output
 ```
 
 _© 2022 XYZ, Inc._
+>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
diff --git a/simple-interest.sh b/simple-interest.sh
old mode 100755
new mode 100644
index 27a60fcb55..c34888f099
--- a/simple-interest.sh
+++ b/simple-interest.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+<<<<<<< HEAD
+# Simple Interest Calculator
+# Formula: SI = (P * T * R) / 100
+
+echo "Enter Principal:"
+read P
+echo "Enter Time:"
+read T
+echo "Enter Rate:"
+read R
+
+SI=$((P * T * R / 100))
+echo "Simple Interest = $SI"
+=======
 # This script calculates simple interest given principal, annual rate of interest and time period in years.
 # Do not use this in production. Sample purpose only.
 
@@ -24,3 +38,4 @@ read t
 s=$(expr $p \* $t \* $r / 100)
 echo "The simple interest is: "
 echo $s
+>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd