added information about index.html overriding
fixed merge issue