Server/SQL: Removed Fail Merge by ego

Signed-off-by: AriDEV <aridev666@gmail.com>