`binary-conflict` improves git's binary merge behavior. - View it on GitHub