fold in Adrien's feedback: fixed typo, only warn if max_merge_at_once was actually specified