merging, bringing up to date