Something quick and nasty I used to fix a strange sync collision I had in Dropbox. The strings to change should be self explanatory. Tested in a Git repo I was working on so certain this works well.

fix-dropbox-conflicts.sh

#!/bin/bash

while IFS= read -r -d $'\0' file; do
    dirname="${file%/*}/"
    basename="${file:${#dirname}}"
    removeme=" (Wills-MacBook-Pro's conflicted copy 2013-12-05)"
    newname="${basename/$removeme/}"
    mv -f "$file" "$dirname$newname"

done < <(find . -name "*conflicted\ copy\ 2013-12-05*" -type f -print0)