commit for reg. form
after conflict resolve