made a change to index.html while Matt was working on it. Am I going to need to merge the changes?