The easiest way to resolve a replication conflict is by using DSCC. See the DSCC online help for information.
