version update
fix merge conflict