short array syntax, spacing, indentation
resolved conflict