Bump sbt to 0.13.6 and fix dependency conflict

Bump sbt to 0.13.6 and fix dependency conflict