Thanks, next time I will definitely contact you with this e-mail, forum is too slow
For now I "fixed" it by manually backing up my files and reverting all changes. Sadly, I couldn't pull the remote branch first, as the merge was required and the merge couldn't be completed because of reasons (picture from my previous post).
Best,
Chopin