show common ancestor during conflict resolution