style for ul li
fixing merge conflicts