p4b 1
p4b 2
merge m1 and upm1