Update jshell.c

conflicts