prepare merge with p2