merge code from er-server
merge code from er-server