Add version stuff, check for conflicts
Add conflict test
Merge pull request #31 from PreetamJinka/version-conflicts

Add version conflict code