git should give me operation as conflict when same file modified in different branches

Question

Lets consider

file.txt

aaa
bbb
ccc

In branch A, I\'m changing file content

file.txt

aaa-update
bbb
ccc