updated tests
conflict resolution