this is a demo of how to solve merge conflicts This is a subheading created locally All of this content added to the readme file has been added from my local Git repository.