a little explanation re: MC
resolved merge conflict