fix merge issue; use "server" name and add "-a 0.0.0.0" from upstream