[Bug 439134] New: conflict resolution: replacement of X with X