[IntegrationSpecs] Update for new case with a three-way conflict