add salt
merge