Merge fallout.

src/Data/Project.hs

@@ -13,6 +13,7 @@ import           Control.Monad.IO.Class
 import           Data.Blob
 import           Data.Blob.IO
 import           Data.Language
+import           Data.Semilattice.Lower
 import           Data.Text (Text)
 import qualified Data.Text as T
 import           Semantic.IO

src/Semantic/Graph.hs

@@ -71,12 +71,8 @@ import           Data.Functor.Foldable
 import           Data.Graph
 import           Data.Graph.ControlFlowVertex (VertexDeclaration)
 import           Data.Language as Language
-<<<<<<< HEAD
 import           Data.List (find, isPrefixOf, isSuffixOf)
 import           Data.Map (Map)
-=======
-import           Data.List (isPrefixOf)
->>>>>>> origin/master
 import qualified Data.Map as Map
 import           Data.Project
 import           Data.Proxy