`binary-conflict` improves git's binary merge behavior.
By chatting or signing in you agree to the Terms and chat-message logging (revocable in History).