Fix merge conflict.
Fix logging.