fixed merge conflict in the css file