Cleans up leftover merge error on admin.css.scss