New version build
Overwriting conflicts