sample solns for 11
lesson 12
resolved merge conflicts