hamel's picture
set default for merge (#1044)
63fb3eb unverified