license change
API: tweak error message
API: rewrite mergeContent