Trying a different way of syncing with upstream