add files were conflict