updates to github merge