t / t5100 / msg0016on commit apply: register conflicted stages to the index (4f4a6cb)
   1and some content
   2