Stop Merging Permission Sets. Start With a Golden Set.
Merging Salesforce security metadata does not resolve the disagreement between two branches. It just makes the disagreement happen automatically, on the way to production, with nobody watching. Keep an approved Golden Set in its own branch, overwrite the promotion branch before Salesforce sees it, and there is nothing left to merge.