Remove unwanted Dropbox conflict file. Sorry.

Sorry, but it looks like one of my Dropbox conflict files got merged into my last pull request. The objective-c file is fine, this is just a file that gets created by Dropbox when there is a file conflict (editing files before sync is complete) and this one slipped in.