merge conflicts in Git

Competing lines change merge conflict

merge is the point at which two lines of development reconverge(收敛).

the situation looks like two screenshots below:

figure-(1)
the other from gitk:

figure-(2)

To resolve this issue, must choose which changes to incorporate(合并) from different branches in a new commit. Rough/core procedures are what to list below:
(a)see&verify merge conflict in specific file
    like <<<<<<,=====,>>>>> conflict markers
(b)decide changes you want in the final merge by deleting conflict markers.
(c)add or stage changes
(d)commit

removed file change merge conflict

(as follow-up without encountering yet)