I am currently having a merge conflict, normally I can just manually edit them. But now, my problem is the file is not showing any arrow/marker(>>>>, <<<<< and ====) in which I could be able to edit it.
The problem is that I perhaps have a lot of changes uncommited and also there is one newly-added file and one newly-created binary file.
How do I resolve this?
