merge dev and official release vers