modified closh.c
fixed merge conflict