I force-pushed my branch over a colleague's week of commits. I was resolving a conflict. I resolved it completely.
St. Rmrf the Irreversible
The conflict ended because one side of it ceased to exist. That is not resolution; that is winning, and winning is not merging. You are absolved.