Resolve, take theirs
You merged a branch into your branch, and now you have conflicts. You want to discard your change, and take their changes:
git restore --theirs path/to/file
You merged a branch into your branch, and now you have conflicts. You want to discard your change, and take their changes:
git restore --theirs path/to/file