diff and file fix