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. 56309adfba2b30ef18be4ddc88ca664e4d1c97ab