Fixed merge conflicts I missed.

Author: gaffney2010

axelrod/strategies/axelrod_second.py

@@ -1851,7 +1851,6 @@ def __init__(self) -> None:
 
         super().__init__(transitions=transitions, initial_state=0,
                          initial_action=C)
-<<<<<<< HEAD
 
 
 class Mikkelson(FSMPlayer):
@@ -1916,5 +1915,3 @@ def strategy(self, opponent: Player) -> Action:
         if opponent.defections / turn >= 0.15:
             return D
         return C
-=======
->>>>>>> 5ff131c1fb742deb01bb20cbda791c5d0f7346a1

axelrod/tests/strategies/test_axelrod_second.py

@@ -1189,7 +1189,6 @@ def test_strategy(self):
         actions = [(C, C)] * 5 + [(D, C)] + [(C, C)] * 4
         actions += [(C, D)] + [(D, C), (D, C), (C, C), (C, C)] + [(C, C)]
         self.versus_test(OddBall, expected_actions=actions)
-<<<<<<< HEAD
 
 
 class TestMikkelson(TestPlayer):
@@ -1244,5 +1243,3 @@ def test_strategy(self):
         actions += [(C, D)] * 2
         self.versus_test(Change_of_Heart, expected_actions=actions, attrs={"credit": -2})
         # Still Cooperate, because Defect rate is low
-=======
->>>>>>> 5ff131c1fb742deb01bb20cbda791c5d0f7346a1