<<<<<<< A
1
2
3
4
5
=======
original
1
2
3
4
5
6
>>>>>>> B
