(#2816) - Disable failing conflicts test