Incrementing version
merging