Modify GitHubTest_1 to test merge conflict