conflict-resolution This is a sub-heading created locally All of this content added to the readme file has been added from my local Git repository.