merge in updates