Removed a file that was a conflicted copy as a result of Dropbox.