main conflict merged