fix(i18n): resolve conflict

Author: thickkoezz

1-js/02-first-steps/10-ifelse/5-rewrite-if-question/task.md

@@ -4,11 +4,7 @@ Nilai penting: 5
 
 # Tulis ulang 'if' menggunakan '?'
 
-<<<<<<< HEAD
-Tulis ulang `if` menggunakan operator ternary` '?' `:
-=======
-Rewrite this `if` using the conditional operator `'?'`:
->>>>>>> 8c30654f694fe8682f5631809980be931ee4ed72
+Tulis ulang `if` menggunakan operator kondisional `'?'`:
 
 ```js
 let result;