conflictA1
Merge pull request #3 from darnould/conflictA1