Merge "Implement log merging."