updated css files
fix merge conflicts main css