fixed merge mistakes