Re-merging cabal files