add defs
merge