using theme norgeskart/style.css
resolved merge conflict