Did a bad merge job on build.sbt