A merge conflict happens when:
- 2 users start with the same source file
- 2 users edit the same line
- 2 users commit their change
I pulled the changes from the remote repo, so I have the same content at my local repo.
You seem to be describing a different scenario:
- 2 users start with the same source file
- 1 user edits a line and commits
- 2nd user gets the 1st user's change
- 2nd user edits the line and commits
If that's true, that's not a merge conflict: you have the other user's change; and you edited it on purpose.