re-arrange options add comments re-indent
merge conflict s/b keys not buckets