Resolve merge conflicts

mythril/analysis/modules/dos.py

@@ -4,7 +4,6 @@ import logging
 from typing import Dict, cast, List
 
 from mythril.analysis.swc_data import DOS_WITH_BLOCK_GAS_LIMIT
-from mythril.laser.ethereum.strategy.custom import JUMPDEST_LIMIT
 from mythril.analysis.report import Issue
 from mythril.analysis.modules.base import DetectionModule
 from mythril.laser.ethereum.state.global_state import GlobalState
@@ -71,7 +70,8 @@ class DOS(DetectionModule):
 
                 try:
                     self._jumpdest_count[transaction][target] += 1
-                    if self._jumpdest_count[transaction][target] == 2:
+
+                    if self._jumpdest_count[transaction][target] == 3:
 
                         annotation = (
                             LoopAnnotation(address, target)

mythril/laser/ethereum/strategy/custom.py

@@ -7,7 +7,7 @@ from copy import copy
 import logging
 
 
-JUMPDEST_LIMIT = 3
+JUMPDEST_LIMIT = 4
 log = logging.getLogger(__name__)