Started working on the files.py
Resolved conflict