Removed conflicted copy. Turns out that having dropbox in the same folder as a git repo makes for some bad timing.