regist v1
merge conflict issue pg regist