Merge conflict test
Restoring from test
Merge pull request #22 from sealocal/test

Merge conflict test