shrink-conflicts 0.1.0

Tries to minimise diff3-style git conflicts
Documentation