merge options tweaks