See Resolving Mercurial Case-Folding Collision in Windows for more detailed answers.
I was able to solve my problem by renaming the file to something different such as temp.txt
and then committing the change, and then renaming back to the original file name with the case change. Merging into other branches worked fine.