update major version
update minor alternative version
commit before merge
fix conflict