Errors due to improperly resolved merge conflicts

There are a few improperly resolved merge conflicts which are leading to compilation errors.