fixed list style
merge conflict