Fix file names. Change to output all data.
Clean up conflicts.