index.html modified
conflit solved