trying a different merge strategy for the CDH3 commit