Add line to differnent position cause conflict by cherry-pick

Question

I cherry-pick a feature to master.

Scene 1:

Master branch have a.txt file.
0x1 first commit.
a.txt content:
1

Then I create a branch dev, I add "2&qu