Git Hub merge conflict testing