team 2 changed index.html
team 2 resolve conflict