new strategy name

the three-way merge is probably not the best suited default strategy to
implement. instead, a patch commute strategy seems better to do)