Pilate conflict resolution