Removed conflicted copies

Removed conflicted copied created due to original Dropbox syncing
issues.