added conflict test file