prep for merging
merge
update assembly version