Merge in updates