conflict-resolution

<<<<<<< HEAD

This is a subheading created locally

All of this content added to the readme file has been added from my local Git repository.

This is a subheading created on GitHub

All of this content added to the readme file has been added from my remote GitHub repository.

2e83f22ab54eaeae6e870dff5c47aa06f847b8e6