Add ID to .info
info version update
after merging sub branch conflicts