Another bad merge conflict in escc.c?