Added conflict test