Update list.txt

merge problem fixed