bracket indexing
fixed merge conflicts