added conflict test text