readme
fixed merge on sass