t / t5100 / msg0016on commit t6036: add a failed conflict detection case with conflicting types (451a3ab)
   1and some content
   2