edited index.html
resolve merge conflict
completed index edits for feature set 1