Deleted Conflict.js test file