Added a log entry.
Merged origin with local.