update to version merged into master