merdge and update