now with merging to line up local master with upstream master