<<<<<<< HEAD

Testing a merge conflict.

=======

Another text string.

>>>>>>> ref/heads/feature-branch

<<<<<<< HEAD

=======

>>>>>>> ref/heads/feature-branch