adding a conflict file to test with