checkin CSS with conflicts marked, for now...