Add better merge options