make the three way merge thing a separate section, we don't really
even need it but should be fine