manage version conflicts and keep the last
upgrade version
Merge pull request #16 from gsaunier/master

1.0.11