Merge "Test conflict notification work when using cached address"