Handle merge failure
Merge pull request #9 from lanfeust69/master

Handle merge failure