sample solns for 12
merging changes