Take out reverse_merge deps, include yaml
Take out consecutive snapshot detection - logic still doesn't seem right