Resolved merge bugs from squash.