conflict test again