simplifying the reconciliation flow
adding tombstone reconciliation and supporting unit tests