Update merge options