Done with list.c
Fixed merge conflict