Add file test for conflict feature