Right now, it's a little confusing to check which block is being currently reviewed in the merge tool (or on the diff tool). Only colors might not be enough, or, maybe, changing the color on the scroll bar may be the solution.