removed merge conflict from css file