I encounterd the similar error such as
fatal: Reference has invalid format: 'refs/heads/user-search-api (Sithu's conflicted copy 2016-01-08)'
Simply deletion of the file .git/refs/heads/user-search-api (Sithu's conflicted copy 2016-01-08)
in the remote Dropbox repository did solve the problem.