add cross IDC conflict solution