Add new server into project
Fix Conflick