This is the title of my commit

This is the detail of the commit message. This is the detail of the
commit message. This is the detail of the commit message. This is the
detail of the commit message. This is the detail of the commit message.
This is the detail of the commit message. This is the detail of the
commit message.
editing second copy
merged conflicts