index.html x modification
index.html > reso conflit