Use p4merge for merges