prepare merge with p2 #2