updating merging strategy build.sbt