Added url import to custom css
Fixed merge conflict