Git conflicted copy error while sync by Dropbox

Problem I save my repo in dropbox, and one day (see date below) it went crazy. Now I get these warning every time I try to autocomplete a branch name I am using Dropbox to sync a git repository, but now when I try and push I am getting an error: fatal: Reference has invalid format: 'refs/heads/master (MacBook-Pro's conflicted copy 2015-06-11)' Fixing So, it seems that Dropbox detected a conflict and created a copy. Ok, no problem, so I deleted the conflicted file. Still, getting the......