git merge auto resolving instead of showing merge conflict

Question

I\'ve two branches feature and development and for the sake of simplicity, assuming that both the branches have only one file, say test.py