dev_user merge