added C files
fixed merge conflicts