Fix merge conflicts

src/apps/canvas/structure-view.ts

src/mol-geo/geometry/direct-volume/direct-volume.ts

src/mol-geo/geometry/geometry.ts

src/mol-geo/geometry/lines/lines.ts

src/mol-geo/geometry/mesh/mesh.ts

src/mol-geo/geometry/points/points.ts

src/mol-gl/renderer.ts

src/mol-plugin/behavior/static/representation.ts

src/mol-plugin/state/transforms/visuals.ts

src/mol-repr/representation.ts

src/mol-repr/shape/representation.ts

src/mol-repr/structure/complex-representation.ts

src/mol-repr/structure/complex-visual.ts

src/mol-repr/structure/registry.ts

src/mol-repr/structure/representation/ball-and-stick.ts

src/mol-repr/structure/representation/cartoon.ts

src/mol-repr/structure/units-representation.ts

src/mol-repr/structure/units-visual.ts

src/mol-repr/volume/registry.ts

src/mol-repr/volume/representation.ts