modify the conflict part