merge code add and edit
function update status issue