new merge options when on master