conflict-resolution This is subheading created locally All of this content added to the readme file has been added from my local Git repository. Some other change local change Change made on GitHub GitHub change