Add an AUTOMERGE option to enable/disable automatically merge