diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..995f26e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. windows10]
+ - Version [e.g. 0.1.1-beta]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/README.md b/README.md
index 1ab48d0..655e786 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-# 3DICU
+# OpenUniverse
 3D Infinite Computer Universe
 
 <p align="center">
-  <img src="https://github.com/MatinAfzal/3DICU/assets/128434167/b88d37b6-3135-4314-b1cf-9b5804876794" />
+  <img src="https://github.com/user-attachments/assets/b46ed21d-01a3-499d-95ab-a082da327c81" />
 </p>
 
 <h3 align="center">An open source implementation of 3D Computer Universe</h3>
 
+<<<<<<< HEAD
 [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2FMatinAfzal%2F3DICU&count_bg=%2379C83D&title_bg=%23555555&icon=docusign.svg&icon_color=%23E7E7E7&title=Views&edge_flat=false)](https://hits.seeyoufarm.com)
 
 I started programming a computer universe based on voxels in February 2024 and I am trying to make it more complete. 
@@ -14,6 +15,10 @@ This project has an internal 3D rendering engine that was built by me using Open
 
 You can find more information about FA-Engine here: [FAE Repository](https://github.com/MatinAfzal/FloatArtsEngine)
 
+=======
+I started programming a computer universe based on voxels in February 2024 and I am trying to make it more complete.   
+This project has a custom built-in 3D rendering engine written using OpenGL
+>>>>>>> d2957e2c00b251f0d0c7419ef3d94336c9605444
 Any programmer can use the codes in this project to build his own world or help improve OpenUniverse.
 
 Developer: [@MatinAfzal](https://github.com/MatinAfzal)