We don't need to increment the version, the snapshot will remain constant until a release.  
Reverting this will also resolve the conflict issue I think too.