conflict1
Merge pull request #4 from darnould/conflictA2