# This is a combination of 2 commits.
# The first commit's message is:

Commit conflict

# This is the 2nd commit message:

Commit some data
Commit some data
Commit
no message