add entry
merge