add Haskell settings
merge conflict