Made some conflicting changes to davefile.txt