Logger injection
Fix spelling merge conflict