fix logs only to one server
fix merge onflicts
Merge branch 'test'