added test "conflict"