target conflict merged