add .c to gitignore
solved merge conflict