add list
add text
conflict fixed