merging branch with upstream