merge up to date changes