Improved logging
Fixed a merge conflict