diff --git a/build.sbt b/build.sbt
index 5695f3cf..73da9381 100644
--- a/build.sbt
+++ b/build.sbt
@@ -88,6 +88,7 @@ libraryDependencies ++= Seq(
   "org.json4s" %% "json4s-native" % "3.6.8"
 )
 
+<<<<<<< HEAD
 //javaOptions in run ++= Seq(
     //"-Xms2G", "-Xmx4G", "-XX:MaxPermSize=1024M", "-XX:+UseConcMarkSweepGC")
 //)
@@ -122,6 +123,35 @@ publishTo := {
   val nexus = "https://oss.sonatype.org/"
   if (v.trim.endsWith("SNAPSHOT")) {
     Some("snapshots" at nexus + "content/repositories/snapshots")
+=======
+lazy val publishSettings = Seq(
+  publishMavenStyle := true,
+  publishArtifact in Test := false,
+  pomIncludeRepository := { x => false },
+  pomExtra := (<url>http://chisel.eecs.berkeley.edu/</url>
+  <licenses>
+    <license>
+      <name>apache_v2</name>
+      <url>https://opensource.org/licenses/Apache-2.0</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>chick</id>
+      <name>Charles Markley</name>
+      <url>https://aspire.eecs.berkeley.edu/author/chick/</url>
+    </developer>
+  </developers>),
+  publishTo := {
+    val v = version.value
+    val nexus = "https://oss.sonatype.org/"
+    if (v.trim.endsWith("SNAPSHOT")) {
+      Some("snapshots".at(nexus + "content/repositories/snapshots"))
+    } else {
+      Some("releases".at(nexus + "service/local/staging/deploy/maven2"))
+    }
+>>>>>>> 007c9c0... Remove explicit pom scm from build.sbt (#281)
   }
   else {
     Some("releases" at nexus + "service/local/staging/deploy/maven2")