Stay calm; a conflict just means Git could not decide between two edits to the same lines. Nothing is broken, and nothing is lost.
Work through it in order:
Run git status to see which files conflict.
Open each one and find the <<<<<<<, =======, >>>>>>> markers.
Edit the region to the correct final result, deleting all three markers.
Stage the fixed file with git add.
When every file is done, run git commit to finish the merge.
The mistake people make is leaving a marker behind or picking one side blindly. Read both versions and keep what the code actually needs. If it goes wrong, git merge --abort returns you to the state before you started, so you can retry fresh.
Rewriting in plainer words…
This answer doesn't lend itself to a diagram - it reads best . No credits were charged.
