info version update
after merging sub branch conflicts