Rather than having this file know about the preferred merge strategy, what if we just called `Branch.merge` and let that method in branch.rb handle checking for the preferred strategy and make the necessary call?