deleting conflict test

deleted conflict test