This feature is incredibly useful, I still need to fall back to vim for large code merges and conflicts resolution