Added no edit for merge options and removed autosetupmerge