merging in updates