working version of css saved
fix merge conflicts