You first rebase against the master locally and push the merged feature branch after resolving all the conflicts yourself. Afterwards, you go to the master and merge it against the updated feature branch. The 2nd merge should not result in any conflicts.
[1] https://en.wikipedia.org/wiki/Hard_problem_of_consciousness