update references
merge