Merge the upstream branch properly