fix merge conflicts

Author: hyperthunk

distributed-process-extras.cabal

@@ -13,7 +13,7 @@ Homepage:       http://github.com/haskell-distributed/distributed-process-extras
 Bug-Reports:    http://github.com/haskell-distributed/distributed-process-extras/issues
 synopsis:       Cloud Haskell Extras
 description:    Supporting library, providing common types and utilities used by the
-                various components that make up the distributed-process-platform package.
+                various libraries built on top of distributed-process
 category:       Control
 Tested-With:    GHC==7.10.3 GHC==8.0.1 GHC==8.0.2
 data-dir:       ""