Add docs for interacting with files
Fix merge conflicts