Fix conflicts again

module/data/action/action.mjs

@@ -498,7 +498,6 @@ export class DHBaseAction extends foundry.abstract.DataModel {
 
     /* SAVE */
     async rollSave(target, event, message) {
-<<<<<<< HEAD
         if(!target?.actor) return;
         return target.actor.diceRoll({
             event,
@@ -512,27 +511,6 @@ export class DHBaseAction extends foundry.abstract.DataModel {
         }).then(async (result) => {
             if(result) this.updateChatMessage(message, target.id, {result: result.roll.total, success: result.roll.success});
         })
-=======
-        if (!target?.actor) return;
-        target.actor
-            .diceRoll({
-                event,
-                title: 'Roll Save',
-                roll: {
-                    trait: this.save.trait,
-                    difficulty: this.save.difficulty,
-                    type: 'reaction'
-                },
-                data: target.actor.getRollData()
-            })
-            .then(async result => {
-                if (result)
-                    this.updateChatMessage(message, target.id, {
-                        result: result.roll.total,
-                        success: result.roll.success
-                    });
-            });
->>>>>>> main
     }
 
     async updateChatMessage(message, targetId, changes, chain = true) {

module/documents/actor.mjs

@@ -1,12 +1,8 @@
 import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs';
 import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs';
 import DamageReductionDialog from '../applications/damageReductionDialog.mjs';
-<<<<<<< HEAD
-import Resources from '../applications/resources.mjs';
-=======
 import { LevelOptionType } from '../data/levelTier.mjs';
 import DHFeature from '../data/item/feature.mjs';
->>>>>>> main
 
 export default class DhpActor extends Actor {
     async _preCreate(data, options, user) {