add haskell&coffee
Resolve conflict