chapter 6: mean check
resolved merge conflicts