Merge conflict fixed, removed not about the chapter not being updated
for 6.2.