Add merge type setting to repository page. The merge type is a per repository setting. Add it to the edit page.