After git merge
Click the "pen" icon at the bottom left of the screen:
You will see a panel showing files having merge conflict, select any to open the merge editor. Save and close the file after you resolved conflict(s), a dialogue will appear telling you to accept the merged result, then click OK.
