Use P4 merge tool