fix: resolve merge conflicts and standardize language in micro and macro task explanation

Author: gabifs

2-ui/99-ui-misc/03-event-loop/2-micro-macro-queue/solution.md

@@ -40,18 +40,11 @@ console.log(7);
 
 To summarize,
 
-<<<<<<< HEAD
-1. Numbers `1` и `7` show up immediately, because simple `console.log` calls don't use any queues.
-2. Then, after the main code flow is finished, the microtask queue runs.
-    - It has commands: `console.log(3); setTimeout(...4); console.log(5)`.
-    - Numbers `3` и `5` show up, while `setTimeout(() => console.log(4))` adds the `console.log(4)` call to the end of the macrotask queue.
-=======
 1. Numbers `1` and `7` show up immediately, because simple `console.log` calls don't use any queues.
 2. Then, after the main code flow is finished, the microtask queue runs.
     - It has commands: `console.log(3); setTimeout(...4); console.log(5)`.
     - Numbers `3` and `5` show up, while `setTimeout(() => console.log(4))` adds the `console.log(4)` call to the end of the macrotask queue.
->>>>>>> d78b01e9833009fab534462e05c03cffc51bf0e3
     - The macrotask queue is now: `console.log(2); console.log(6); console.log(4)`.
 3. After the microtask queue becomes empty, the macrotask queue executes. It outputs `2`, `6`, `4`.
 
-Finally, we have the output: `1 7 3 5 2 6 4`.
+Finally, we have the output: `1 7 3 5 2 6 4`.