<<<<<<< HEAD
These are my changes
||||||| merged common ancestors
These are original texts
=======
These are your changes
>>>>>>> master

Past the end
