removed conflict string