merging the two files-- again: commented out code gives this weird error