merge up to current