unit test cleanup
conflict resolution..