diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 7e96f8055..54d80a955 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -175,12 +175,9 @@ export abstract class PortfolioCalculator {
 
     if (!transactionPoints.length) {
       return {
-<<<<<<< HEAD
         activitiesCount: 0,
-=======
->>>>>>> 6e5db62f (Code review fixes)
-        currentValueInBaseCurrency: new Big(0),
         createdAt: new Date(),
+        currentValueInBaseCurrency: new Big(0),
         errors: [],
         hasErrors: false,
         historicalData: [],
diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
index 33168e832..059b85441 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
@@ -104,8 +104,8 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       activitiesCount: this.activities.filter(({ type }) => {
         return ['BUY', 'SELL'].includes(type);
       }).length,
-      errors: [],
       createdAt: new Date(),
+      errors: [],
       historicalData: [],
       totalLiabilitiesWithCurrencyEffect: new Big(0),
       totalValuablesWithCurrencyEffect: new Big(0)