new & create record done
fixed merge errors