diff --git a/.docs/changelog.md b/.docs/changelog.md
index 23d45a737b574ce0454d488ef5790d54bcefacbf..ae517bd6ce88556b2d563abb0d01d8b0c9c7f517 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -19,12 +19,8 @@ author: Martin Weise
 
 #### Changes
 
-<<<<<<< Updated upstream
-* Remove the Data Database Sidecar and replace it with Apache Spark 4.
-=======
 * Remove the Data Database Sidecar and replace it with Apache Spark
   in [#458](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/458).
->>>>>>> Stashed changes
 * Allow anonymous users to create subsets for public databases
   in [#449](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/449).
 * Show file upload progress
diff --git a/dbrepo-ui/composables/identifier-service.ts b/dbrepo-ui/composables/identifier-service.ts
index 96e5610c8c11161b0a4c1687e630204f80e53554..f85c48dc21f1428ea0656a00861eb260e48c0cf5 100644
--- a/dbrepo-ui/composables/identifier-service.ts
+++ b/dbrepo-ui/composables/identifier-service.ts
@@ -288,7 +288,7 @@ export const useIdentifierService = (): any => {
     if (!data) {
       return null
     }
-    return data.doi !== null ? 'DOI' : 'URI'
+    return data.doi ? 'DOI' : 'URI'
   }
 
   function creatorToCreatorJsonLd(creator: CreatorDto) {