before merge pro.user
finish merge
remove the pro.user