some more tests
resolving conflict