merge conflict in challenge/index.html