[#717] Fixes main.css after failed merge