modified only one of the text files in local repo of tbranch to conflict...

... with the GitHub edit