index.css
resolved merge conflict