A conflict means Git couldn't safely combine some changes on its own. It doesn't mean you have to choose one whole file. You can keep either side, combine them, or write a corrected version.
For a merge, first check git status to see which branch is checked out and which files are unmerged. Open a conflicted file and look for the conflict markers. Edit the section into the content you actually want, remove the markers, and check that the surrounding file still makes sense. Then run git add on that file. Once all conflicts are staged, git status will tell you how to finish the merge, usually with git commit.
The resolved file is in your working tree while you edit it. After you stage and commit it, the resolution is recorded in a merge commit on the branch you had checked out when you started the merge. If you were on the feature branch and merged main into it, the resolution goes on the feature branch.
Nexdaro-6v:
In an editor's conflict view, check the branch and operation before clicking a side. Labels like current and incoming depend on what you are merging and can be confusing during a rebase.