[FIX] Merge mistake on single-server

[AlexAlexandre]

Proposed changes

Just fixing two wrong merged file.

Issue(s)

N/A

How to test or reproduce

N/A

Screenshots

N/A

Types of changes

• Bugfix (non-breaking change which fixes an issue)
• Improvement (non-breaking change which improves a current function)
• New feature (non-breaking change which adds functionality)
• Documentation update (if none of the other choices apply)

Checklist

• I have read the CONTRIBUTING doc
• I have signed the CLA
• Lint and unit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works (if applicable)
• I have added necessary documentation (if applicable)
• Any dependent changes have been merged and published in downstream modules

Further comments

[lgtm-com]

This pull request fixes 6 alerts when merging d03d3b1 into ea46ae8 - view on LGTM.com

fixed alerts:

• 4 for Assignment to constant
• 2 for Useless assignment to local variable