Fix conflicts

src/encryption/encryption.ts

@@ -294,9 +294,6 @@ export const publishOnQDN = async ({
 }) => {
   if (data && service) {
     const registeredName = name || (await getNameInfo());
-}) => {
-  if (data && service) {
-    const registeredName = await getNameInfo();
     if (!registeredName)
       throw new Error(
         i18n.t('core:message.generic.name_publish', {

src/qdn/publish/publish.ts

@@ -83,29 +83,25 @@ async function getKeyPair() {
 }
 
 export const publishData = async ({
+  category,
   data,
+  description,
   feeAmount,
   filename,
   identifier,
   isBase64,
   registeredName,
-  file,
   service,
-  identifier,
-  uploadType,
-  withFee,
-  title,
-  description,
-  category,
   tag1,
   tag2,
   tag3,
   tag4,
   tag5,
+  title,
+  uploadType,
+  withFee,
 }: any) => {
   console.log('data', data);
-  feeAmount,
-}: any) => {
   const validateName = async (receiverName: string) => {
     return await reusableGet(`/names/${receiverName}`);
   };
@@ -232,7 +228,7 @@ export const publishData = async ({
 
     let transactionBytes = await uploadData(registeredName, data, fee);
     console.log('transactionBytes length', transactionBytes?.length);
-    
+
     if (!transactionBytes || transactionBytes.error) {
       throw new Error(transactionBytes?.message || 'Error when uploading');
     } else if (transactionBytes.includes('Error 500 Internal Server Error')) {