add conflict handler test file