Add versioned conflict/replace