other than sublime, is there any other tool to see the conflict?

[jaw6]

Any editor will show the merge conflict -- you'll see >>>>, ===== and <<<<< in any text editor you use to view the files.