change conflict name