Fix conflict in merge in tomato.c handler