merge latest changes
update index