fix cabal merge