1.0.13.13: Actually export RESOLVE-CONFLICT et al from SB-EXT