Adds email tests
Adds tests for matching verifications
resolves conflict
conflicts resolved