Update githubTest.java

conflict test