Fix: version number got decreased while merging