update everything
update everything + merging