Remove unwanted Dropbox conflict file. Sorry.

Sorry, but it looks like one of my Dropbox conflict files got merged into my last pull request.