merge
merge
fix release function