add test file for conflict