testing pull and merge with github client

hopefully it won't mess up.