sample solns for 12
committing merge updates