update srcs
merge conflict with main.c