Better logging.
Mergeconflict fix