git show
111
<<<<<<< HEAD
222
=======
333
>>>>>>> a-branch