.
.
Fix conflicts after disk crash.