Merging
updated filltext haskell