renamed conflit name