Update vlog95 results and fix merge issues.