Go back to diff 3 merge style