testing array
merge conflict
added notation
Fixed