conflict-resolution <<<<<<< HEAD This is a sub-heading 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. a76c1cbe5963b5c4b38a6dd838efda9f3d3ac3fe