added merge & diff settings