removed noconflict testing folder