Remove unwanted Dropbox conflict file. Sorry.
Merge pull request #481 from levibostian/remove-conflict-file

Remove unwanted Dropbox conflict file. Sorry.