#8 update User, #20 create service, #4 update database config
merge