fix functions merge issue