Merging branches says no changes but Diff check shows differences

Hi, I merge two branches and the message comes up that there are no changes, but when i run the diff checker there ARE code differences between the branches in two of the scripts .

Why wont the merge tell me about those differences/conflict and give me the option to choose which to use? Why does it just ignore them and say that there are no changes?

Thanks