Demarcate insertions/deletions in humanized diff
Always merge during a clean
Add integration test suite