Brew build emacs with gnutls support.
Bound C-x v R to vc-resolve-conflicts.