conflict-resolutions

This is a subheading created locally

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