add 1.2.2 & 1.2.3
Fix conflict