how to read git merge conflicts code example

Example: how to show code conflicts in git

$ git statusOn branch masterYou have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge)Unmerged paths:(use "git add ..." to mark resolution)both modified:   merge.txt