public files
public files and conflicts