fix publish
merge