testing_github_desktop Here is a change to my readme file Checkboxes are cool MERGE CONFLICT ATTEMPT This is from a second machine