diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 9b0af17cb..69dc34ec0 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -18,7 +18,7 @@ class AssetsController < ApplicationController
 
   before_action :load_vars, except: :create_wopi_file
   before_action :check_read_permission, except: %i(edit destroy duplicate create_wopi_file toggle_view_mode)
-  before_action :check_edit_permission, only: %i(edit destroy duplicate rename toggle_view_mode)
+  before_action :check_manage_permission, only: %i(edit destroy duplicate rename toggle_view_mode)
 
   def file_preview
     render json: { html: render_to_string(
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index 76626ea44..707765a00 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -591,15 +591,12 @@ en:
       edit_image_on_inventory_item: "Inventory item image edited"
       edit_wopi_file_on_inventory_item: "Inventory item wopi file edited"
       export_inventory_stock_consumption: "Inventory stock consumptions exported"
-<<<<<<< HEAD
       task_step_asset_renamed: "File attachment on Task step renamed"
       protocol_step_asset_renamed: "File attachment on Protocol step renamed"
       result_asset_renamed: "File attachment on Task result renamed"
-=======
       task_step_file_duplicated: "File attachment on Task step duplicated"
       result_file_duplicated: "File attachment on Task result duplicated"
       protocol_step_file_duplicated: "File attachment on Protocol step duplicated"
->>>>>>> ea4c356e1 (Add file duplicate activities [SCI-10257])
     activity_group:
       projects: "Projects"
       task_results: "Task results"