recreated parse.c after merge