sample solns for 11
merge conflicts