css and index html conflict merges