fixed merge errors input.c