fixed errors that occurred during merge.