diff --git a/orders/db/schema.cds b/orders/db/schema.cds
index 16b8f0c1..865ccddc 100644
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -1,25 +1,22 @@
-<<<<<<< HEAD
-using { sap.capire.bookshop.Books } from '../../bookshop/db/schema';
-using { Currency, managed, cuid }   from '@sap/cds/common';
-namespace sap.capire.bookshop;
-=======
-using { Currency, User, managed, cuid } from '@sap/cds/common';
+using { sap.capire.bookshop.Books }       from '../../bookshop/db/schema';
+using { User, Currency, managed, cuid }   from '../../common';
 namespace sap.capire.orders;
->>>>>>> 534af7ffee60e086c563dbaa450e86e5fca5cf2b
 
 entity Orders : cuid, managed {
   OrderNo  : String(22) @title:'Order Number'; //> readable key
-  Items    : Composition of many {
-    key ID    : UUID;
-    product   : Association to Products;
-    quantity  : Integer;
-    title     : String; //> intentionally replicated as snapshot from product.title
-    price     : Double; //> materialized calculated field
-  };
+  Items    : Composition of many OrderItems;
   buyer    : User;
   currency : Currency;
 }
 
+entity OrderItems : cuid, managed {
+    book      : Association to Products;
+    quantity  : Integer;
+    title     : String; //> intentionally replicated as snapshot from product.title
+    amount    : Double; //> materialized calculated field
+    netAmount : Double; 
+}
+
 /** This is a stand-in for arbitrary ordered Products */
 entity Products @(cds.persistence.skip:'always') {
   key ID : String;
@@ -27,4 +24,4 @@ entity Products @(cds.persistence.skip:'always') {
 
 
 // this is to ensure we have filled-in currencies
-using from '@capire/common';
+// using from '@capire/common';
diff --git a/package-lock.json b/package-lock.json
index 19e55f52..765466f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,12 @@
         "./reviews"
       ],
       "dependencies": {
+        "@capire/bookshop": "./bookshop",
+        "@capire/common": "./common",
+        "@capire/fiori": "./fiori",
+        "@capire/media": "./media",
+        "@capire/orders": "./orders",
+        "@capire/reviews": "./reviews",
         "@sap/cds": ">=5.5.3"
       },
       "devDependencies": {
diff --git a/package.json b/package.json
index c5b2eb7f..95108a7a 100644
--- a/package.json
+++ b/package.json
@@ -5,16 +5,13 @@
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "dependencies": {
-<<<<<<< HEAD
     "@capire/bookshop": "./bookshop",
     "@capire/common": "./common",
     "@capire/fiori": "./fiori",
     "@capire/media": "./media",
     "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews"
-=======
+    "@capire/reviews": "./reviews",
     "@sap/cds": ">=5.5.3"
->>>>>>> 534af7ffee60e086c563dbaa450e86e5fca5cf2b
   },
   "workspaces": [
     "./bookshop",