Update bug_report.md

Author: Johnson070

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,16 +10,9 @@ assignees: Johnson070
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-<<<<<<< HEAD
-**Attach bin or zip file**
-=======
 **Attach .bin file or zip**
 Attach watchface
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
->>>>>>> 7adb83f7cac56b016972c83dd2e6974ed4e18800
-
 **Screenshots**
 If applicable, add screenshots to help explain your problem.