Finish read repair, could be buggy
Merge conflict