Versions and conflict merging

by João Ramos