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