removed shell.c
merge error