Comment 41 for bug 269539

I should add, unlike the original poster, I was not notified of any conflicts when merging, so the presence (or absence) of conflicts when merging does not appear to be the root cause of the problem. A quick grep shows there are no lines containing >>> in the file I uploaded as well, and a visual scan didn't turn up what I would easily recognize as a conflict.