fixed merge mistakes.