deleted contents of file, in case file itself doesn't delete
Merge origin/master