Add the basic main.c file
Fix conflict