merge & update