merge with upstream remote