Adds logging
Resolves conflicts