resolve conflict and re-short array
Merge branch 'patch/conflict-array-syntax' into develop
of PR #21