merged conflict string