You need rebase instead. Merge just creates useless commits and makes the diffs harder to comprehend (all changes are shown at once, but with rebase you fix the conflicts in the commit where they happened)

Then instead of your branch of branch strat you just rebase daily into main and you’re golden when it comes time to PR

For me the infinity subscription bypass stopped working so I finally made the switch