Fixed wrongly resolved merge conflicts.