fixed merge problem with css/default.css