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