Add error lookup for committed log entries.
solve conflicts