You can use
git checkout --theirs -- path/to/file.txt
to checkout what you fetched
git checkout --ours -- path/to/other/file.txt
to checkout what you had originally.
git diff --name-only --diff-filter=U | xargs git checkout --ours --
to use your version of all conflicted files.