fix conflicts paris.html