work on hasFile and file.
fix conflicts.