1
<<<<<<< HEAD
2
This is some content
3
which is very important to Serif
4
=======
5
Totally different text
6
>>>>>>> new_branch_to_merge_later