Updated cabal, finished merge