Retire 'stupid' merge strategy