This often happens because of casing differences in the file names, so Git gets confused.

In this case just rename the file that causes the confusion. Thus you save yourself from unexpected behavior.