signal.c == Fix merge conflicts