Before the start

<<<<<<< HEAD
These are my changes
=======
>>>>>>> master

Past the end
