Fixes merge remnant.
Fixes merge remnant.

Solinea/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server