add to list functions added
add to list functions added
fixed conflicts