Changed a log output to debug
Merge conflict