added haskell solutions
fixed merge