formatting
fixed merge conflict
Loggers deprecated