Add missing merge options from previous commit