fixed merge conflict in css file