add test for conflict views