Regarding branches and merge conflicts:

Doubling down on using branches means these problems will continue.

Personally, I don’t want to live with problems that are solvable and the only reason we can’t fix them is … what exactly? The resistance to collaborating? Learning how to work in a way you haven’t experienced yet?