Fix renegotiate on new merge