updated the sbt build and removed conflict warnings