Skip to content
<<<<<<< HEAD
This is content from branchA
=======
This is content from branchB
>>>>>>> branchB