Settling conflicts before we have conflicts

- Gleaning Mustard Seeds with Jerrie Barber