fix
terms
merge