Git conflicted copy error while cloning a repository

Question

I am using dropbox as a git repository.

Now due to some issue in the syncing, there is some conflicted copy present in the git. How do I remove this conflict ? Due to

Answer 1

Just delete every file in /.git/ which ends in (... conflictedcopy ).

That will clean your git repo; the answer by Frank R. does in fact the same, while keeping the other by Dropbox abused files :)