update to use p4 merge