feat: allow disabling auto-settle on merge (#5880)