message: actually saving files...
diff: @@ -5,18 +5,11 @@ import * as path from "path";
  import { expect, assert } from "chai";
  import * as TypeMoq from "typemoq";
  import { OpenMode, DbOpcode } from "@bentley/bentleyjs-core/lib/BeSQLite";
  -<<<<<<< HEAD
  import { AccessToken, Briefcase, ChangeSet, IModel as HubIModel, SeedFile, MultiCode, CodeState, IModelHubClient,
  ConnectClient, Project, ECJsonTypeMap, WsgInstance, Response, UserProfile } from "@bentley/imodeljs-clients";
  import { Code } from "../../common/Code";
  import { IModelVersion } from "../../common/IModelVersion";
  import { KeepBriefcase, BriefcaseManager, BriefcaseEntry } from "../BriefcaseManager";
  -=======
  -import { AccessToken, ChangeSet, IModel as HubIModel, MultiCode, CodeState } from "@bentley/imodeljs-clients";
  -import { Code } from "@bentley/imodeljs-common/lib/Code";
  -import { IModelVersion } from "@bentley/imodeljs-common/lib/IModelVersion";
  -import { KeepBriefcase } from "../BriefcaseManager";
  ->>>>>>> master
  import { IModelDb, ConcurrencyControl } from "../IModelDb";
  import { IModelTestUtils } from "./IModelTestUtils";
  import { Id64 } from "@bentley/bentleyjs-core/lib/Id";
  