adding conflict test