resolve conflicts

Author: Telucero

.CONTRIBUTING.md

@@ -323,11 +323,11 @@ Use these to highlight important information:
 
 **Basic syntax**:
 
-```html
+```
 <div class="termynal" data-termynal>
     <span data-ty="input"><span class="file-path"></span>your-command-here</span>
     <span data-ty="progress"></span>
     <span data-ty>Output line 1</span>
     <span data-ty>Output line 2</span>
 </div>
-```
+```