if the problem is with the base branch

git checkout --ours -- path/to/file

if the problem is with the incoming branch or the branch that is being merged

git checkout --theirs -- path/to/file