try merging based on p4 changes