remove illegal line from css file originating from a merge conflict