merge platform with r3p1