merge and fix
update