Finished merging client by adding to build.sbt