edited index.html
bug fix version 1.1 prod
resolve merge conflict
completed index edits for feature set 1
fixed conflict after master pull