bug fix version 1.1 prod
resolve merge conflict
completed index edits for feature set 1