prepare conflict remote