ser. update
fixed merge conflicts