added a few solns
fixed merge
gf