merge work
update from author