New version number
Conflict resolution