diff --git a/SavageWorlds/SavageWorlds.html b/SavageWorlds/SavageWorlds.html
index eabc5ecb43..931fd0f316 100644
--- a/SavageWorlds/SavageWorlds.html
+++ b/SavageWorlds/SavageWorlds.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div class='sheet-maindiv'>
     <div class="sheet-3colrow">
         <textarea name='attr_things' class='sheet-horror sheet-additionalrules'></textarea>
@@ -22,137 +21,6 @@
                 </tr>
             </table>
         </div>
-=======
-<input type="radio" class="sheet-isPC" name="attr_tab" value="1" checked/> Player Character
-<input type="radio" class="sheet-isNPC" name="attr_tab" value="2" /> Non-Player Character
-
-<div class="sheet-3colrow sheet-tab-content sheet-pc">
-
-    <div class="sheet-col">
-
-    <table>
-        <tr>
-            <td>
-                <label>Name:</label><br/>
-                <label>Rank:</label><br/>
-                <label>XP:</label><br/>
-            </td>
-            <td>
-                <input type="text" name="attr_name" /><br/>
-                <select name='attr_rank' value='novice' class='sheet-rank'>
-                    <option value='Novice'>Novice</option>
-                    <option value='Seasoned'>Seasoned</option>
-                    <option value='Veteran'>Veteran</option>
-                    <option value='Heroic'>Heroic</option>
-                    <option value='Legendary'>Legendary</option>
-                </select>
-                <input type="number" name="attr_xp" /><br/>
-            </td>
-        </tr>
-    </table>
-
-    </div>
-
-    <div class="sheet-col">
-        <p style="text-align: center;">
-			<img src="http://i.imgur.com/iwIoTlT.png" style="max-height: 100px;" />
-		</p>
-	</div>
-
-	<div class="sheet-col">
-    	<table>
-            <tr>
-                <td>
-                    <label>Setting:</label><input type="text" name="attr_setting" /><br/>
-                    <label>Race:</label><input type="text" name="attr_race" /><br/>
-                    <label>Concept:</label><input type="text" name="attr_concept" /><br/>
-                    <label>Catch Phrase:</label><input type="text" name="attr_catchphrase" /><br/>
-                </td>   
-            </tr>   
-        </table>
-	</div>
-
-</div>
-
-<hr/>
-
-<div class="sheet-3colrow">
-
-	<div class="sheet-col">
-
-	<h3 style="margin-bottom: 10px; text-align: center;">Attributes</h3>
-
-	<label>Agility</label>
-	<select name="attr_agility" class="dtype" value='4'>
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-	<button type='roll' name='roll_Agility' value='@{name} rolls an agility test [[{1d@{agility}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-	<label>Smarts</label>
-	<select name="attr_smarts" class="dtype" value='4'>
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-	<button type='roll' name='roll_Smarts' value='@{name} rolls a smarts test [[{1d@{smarts}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-	<label>Spirit</label>
-	<select name="attr_spirit" class="dtype" value='4'>
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-	<button type='roll' name='roll_Spirit' value='@{name} rolls a spirit test [[{1d@{spirit}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-	<label>Strength</label>
-	<select name="attr_strength" class="dtype" value='4'>
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-	<button type='roll' name='roll_Strength' value='@{name} rolls a strength test [[{1d@{strength}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-	<label>Vigor</label>
-	<select name="attr_vigor" class="dtype" value='4'>
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-	<button type='roll' name='roll_Vigor' value='@{name} rolls a vigor test [[{1d@{vigor}, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br />
-
-	</div>
-
-	<div class="sheet-col">
-		<h3 style="text-align: center;">Derived Stats</h3>
->>>>>>> 5bfaf82237f43034cd76b4c1e483ace6a6ba8087
         
         
         
@@ -326,7 +194,6 @@
                     </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
                     <td>Melee Damage: </td>
                     <td>
                         <button type='roll' class='sheet-MacroButtons' name='roll_MeleeDam' value='@{name} rolls melee damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4}! + 1d@{strength}![Strength] + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
@@ -337,17 +204,6 @@
                     <td>
                          <button type='roll' class='sheet-MacroButtons' name='roll_RangedDam' value='@{name} rolls ranged damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4}! + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
                     </td>
-=======
-                    <td>Parry:</td>
-                    <td><input type="number" name="attr_parry" class="sheet-short" value="((@{fighting}-((1 - @{fightingTrained}) * 4))/2)+2" disabled="true" /></td>
-                    <td><input type="number" name="attr_parryMod" class="sheet-short" value="0" /></td>
-                </tr>
-                <tr>
-                    <td>Toughness:</td>
-                    <td><input type="number" name="attr_toughness" class="sheet-short" value="floor(((@{Vigor})/2)+2+@{toughnessmod}+@{toughnessarmor})" disabled="true" /></td>
-                    <td><input type="number" name="attr_toughnessMod" class="sheet-short" value="0" /></td>
-                    <td><input type="number" name="attr_toughnessArmor" class="sheet-short" value="0" /></td>
->>>>>>> 5bfaf82237f43034cd76b4c1e483ace6a6ba8087
                 </tr>
                 <tr>
                     <td>Strength Damage: </td>
@@ -362,7 +218,6 @@
                     </td>
                 </tr>
                 <tr>
-<<<<<<< HEAD
                     <td>Misc Rolls (Exploding)</td>
                     <td>
                         <button type='roll' class='sheet-MacroButtons' name='roll_MiscExp' value='@{name} rolls an exploding misc roll [[?{Number of dice|0}d?{Size of Dice|0}! + ?{Modifier IE: -2 or 2)|0}[Modifier]]]'></button>
@@ -399,455 +254,6 @@
     		<option value="12!+2">d12+2</option>
     		<option value="12!+3">d12+3</option>
     		<option value="12!+4">d12+4</option>
-=======
-                    <td style='width: 25%; text-align: center;'>Wounds</td>
-                    <td style='width: 25%; text-align: center;'>Fatigue</td>
-                    <td style='width: 50%; text-align: center;'>Notes</td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr style='width: 100%;'>
-                    <td style='width: 50%; text-align: center;'><input type='number' name='attr_wound' value='0'></td>
-                    <td style='width: 50%; text-align: center;'><input type='number' name='attr_fatigue' value='0'></td> 
-                    <td style='width: 50%; text-align: center;'><input type='text' name='attr_woundFatigueNotes'></td> 
-                </tr>
-            </tbody>
-        </table>
-	</div>
-
-	<div class="sheet-col">
-        <h3 style="text-align: center;">Quick Macros</h3>
-        <table>
-            <tr>
-                <td>WildCard Trait: </td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_WCTrait' value='@{name} rolls a wildcard test [[{1d?{Die Type|0}!, 1d6!}kh1  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>WildCard Unskilled Test: </td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_WCUnskilled' value='@{name} rolls a wildcard unskilled test [[{1d4!, 1d6!}kh1-2  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Melee Damage: </td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_MeleeDam' value='@{name} rolls melee damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4}! + 1d@{strength}![Strength] + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Ranged Damage: </td>
-                <td>
-                     <button type='roll' class='sheet-MacroButtons' name='roll_RangedDam' value='@{name} rolls ranged damage! [[?{Number of Weapon Dice|1}d?{Weapon Die Size|4}! + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Strength Damage: </td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_StrengthDam' value='@{name} rolls strength damage! [[1d@{Strength}! + ?{Modifier IE: -2 or 2)|0}[Modifier] + ?{Raise on attack roll? (1 for yes)|0}d6[Raise]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Misc Rolls</td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_Misc' value='@{name} rolls a misc roll [[?{Number of dice|0}d?{Size of Dice|0} + ?{Modifier IE: -2 or 2)|0}[Modifier]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Misc Rolls (Exploding)</td>
-                <td>
-                    <button type='roll' class='sheet-MacroButtons' name='roll_MiscExp' value='@{name} rolls an exploding misc roll [[?{Number of dice|0}d?{Size of Dice|0}! + ?{Modifier IE: -2 or 2)|0}[Modifier]]]'></button>
-                </td>
-            </tr>
-            <tr>
-                <td>Run</td>
-                <td><button type='roll' name='roll_run' value='@{name} runs! [[1d?{Running Die Size|6} + ?{Modifier IE: -2 or 2|0}}[Modifier] - @{wound}[Wounds]]]'></button> </td>
-            </tr>
-            <tr>
-                <td>Raise Calculator</td>
-                <td><button type='roll' name='roll_raiseCalc' value='[[floor((?{Number Rolled|0}-?{Target Number|4})/4)]] Raises'></button> </td>
-            </tr>
-        </table>
-	</div>
-    
-</div>
-
-<hr>
-
-<div class="sheet-3colrow">
-
-<div class="sheet-col">
-        <h3 style="margin-bottom: 5px;">Skills</h3>
-        <h5 style="margin-bottom: 5px;">Check boxes for trained skills</h5>
-        <label style="width:100px;">Boating</label>
-        <select name="attr_boating" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_boatingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Boating' value='@{name} rolls a boating test [[{1d@{boating}, 1d6!}kh1 - ((1 - @{boatingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Climbing</label>
-        
-        <select name="attr_climbing" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_climbingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Climbing' value='@{name} rolls a climbing test [[{1d@{climbing}, 1d6!}kh1 - ((1 - @{climbingTrained}) * 2)   + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-
-        <label style="width:100px;">Driving</label>
-        
-        <select name="attr_driving" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_drivingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Driving' value='@{name} rolls a driving test [[{1d@{driving}, 1d6!}kh1 - ((1 - @{drivingTrained}) * 2)  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-
-        <label style="width:100px;">Fighting</label>
-        
-        <select name="attr_fighting" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_fightingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_fighting' value='@{name} rolls a fighting test [[{1d@{fighting}, 1d6!}kh1 - ((1 - @{fightingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Gambling</label>
-        
-        <select name="attr_gambling" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_gamblingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Gambling' value='@{name} rolls a gambling test [[{1d@{gambling}, 1d6!}kh1 - ((1 - @{gamblingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Healing</label>
-        
-        <select name="attr_healing" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_healingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Healing' value='@{name} rolls a healing test [[{1d@{healing}, 1d6!}kh1 - ((1 - @{healingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Intimidation</label>
-        
-        <select name="attr_intimidation" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_intimidationTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Intimidation' value='@{name} rolls an intimidation test [[{1d@{intimidation}, 1d6!}kh1 - ((1 - @{intimidationTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Investigation</label>
-        
-        <select name="attr_investigation" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_investigationTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Investigation' value='@{name} rolls an investigation test [[{1d@{investigation}, 1d6!}kh1 - ((1 - @{lockpickingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Lockpicking</label>
-        
-        <select name="attr_lockpicking" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_lockpickingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Lockpicking' value='@{name} rolls a lockpicking test [[{1d@{lockpicking}, 1d6!}kh1 - ((1 - @{lockpickingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Notice</label>
-        
-        <select name="attr_notice" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_noticeTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Notice' value='@{name} rolls a notice test [[{1d@{notice}, 1d6!}kh1 - ((1 - @{noticeTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Persuasion</label>
-        <select name="attr_persuasion" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_persuasionTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Persuasion' value='@{name} rolls a persuasion test [[{1d@{persuasion}, 1d6!}kh1 - ((1 - @{persuasionTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Piloting</label>
-        <select name="attr_piloting" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_pilotingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Piloting' value='@{name} rolls a piloting test [[{1d@{piloting}, 1d6!}kh1 - ((1 - @{pilotingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Repair</label>
-        
-        <select name="attr_repair" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_repairTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Repair' value='@{name} rolls a repair test [[{1d@{repair}, 1d6!}kh1 - ((1 - @{repairTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Riding</label>
-        
-        <select name="attr_riding" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_ridingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Riding' value='@{name} rolls a riding test [[{1d@{riding}, 1d6!}kh1 - ((1 - @{ridingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-    </div>
-    
-    <div class="sheet-col">
-        <h3>Skills</h3>
-        <h5 style="margin-bottom: 5px;">Check boxes for trained skills</h5>
-        
-        <label style="width:100px;">Shooting</label>
-        
-        <select name="attr_shooting" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_shootingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_shooting' value='@{name} rolls a shooting test [[{1d@{shooting}, 1d6!}kh1 - ((1 - @{shootingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Stealth</label>
-        
-        <select name="attr_stealth" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_stealthTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Stealth' value='@{name} rolls a stealth test [[{1d@{stealth}, 1d6!}kh1 - ((1 - @{stealthTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Streetwise</label>
-        
-        <select name="attr_streetwise" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_streetwiseTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Streetwise' value='@{name} rolls a streetwise test [[{1d@{streetwise}, 1d6!}kh1 - ((1 - @{streetwiseTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Survival</label>
-        
-        <select name="attr_survival" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_survivalTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Survival' value='@{name} rolls a survival test [[{1d@{survival}, 1d6!}kh1 - ((1 - @{survivalTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Swimming</label>
-        
-        <select name="attr_swimming" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_swimmingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Swimming' value='@{name} rolls a swimming test [[{1d@{swimming}, 1d6!}kh1 - ((1 - @{swimmingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Taunt</label>
-        
-        <select name="attr_taunt" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_tauntTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Taunt' value='@{name} rolls a taunt test [[{1d@{taunt}, 1d6!}kh1 - ((1 - @{tauntTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Throwing</label>
-        
-        <select name="attr_throwing" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_throwingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Throwing' value='@{name} rolls a throwing test [[{1d@{throwing}, 1d6!}kh1 - ((1 - @{throwingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <label style="width:100px;">Tracking</label>
-        
-        <select name="attr_tracking" class="dtype">
-		<option value="4!">d4</option>
-		<option value="6!">d6</option>
-		<option value="8!">d8</option>
-		<option value="10!">d10</option>
-		<option value="12!">d12</option>
-		<option value="12!+1">d12+1</option>
-		<option value="12!+2">d12+2</option>
-		<option value="12!+3">d12+3</option>
-		<option value="12!+4">d12+4</option>
-        </select>
-        <input type='checkbox' name='attr_trackingTrained' value='1' class='sheet-trainedchk'>
-        <button type='roll' name='roll_Tracking' value='@{name} rolls a tracking test [[{1d@{tracking}, 1d6!}kh1 - ((1 - @{trackingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
-        
-        <h3 style="margin-bottom: 10px;">Additional Skills (Knowledge etc...)</h3>
-        <fieldset class="repeating_skills">
-            <select name="attr_dtype" class="dtype">
-                <option value="0">U</option>
-                <option value="4!">d4</option>
-                <option value="6!">d6</option>
-                <option value="8!">d8</option>
-                <option value="10!">d10</option>
-                <option value="12!">d12</option>
-                <option value="12!+1">d12+1</option>
-                <option value="12!+2">d12+2</option>
-                <option value="12!+3">d12+3</option>
-                <option value="12!+4">d12+4</option>
->>>>>>> 5bfaf82237f43034cd76b4c1e483ace6a6ba8087
             </select>
             <input type='checkbox' name='attr_boatingTrained' value='1' class='sheet-trainedchk'>
             <button type='roll' name='roll_Boating' value='@{name} rolls a boating test [[{1d@{boating}, 1d6!}kh1 - ((1 - @{boatingTrained}) * 2) + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
@@ -884,7 +290,6 @@
             <input type='checkbox' name='attr_drivingTrained' value='1' class='sheet-trainedchk'>
             <button type='roll' name='roll_Driving' value='@{name} rolls a driving test [[{1d@{driving}, 1d6!}kh1 - ((1 - @{drivingTrained}) * 2)  + ?{Modifier IE: -2 or 2|0}[Modifier] - @{wound}[Wounds] - @{fatigue}[Fatigue]]]'></button><br/>
     
-<<<<<<< HEAD
             <label style="width:100px;">Fighting</label>
             
             <select name="attr_fighting" class="dtype">
@@ -1270,21 +675,4 @@
             <textarea name="attr_psychosis" class='sheet-smalltextarea'></textarea>
         </div>
     </div>
-=======
-    <div class="sheet-col">
-        <h3>Hindrances</h3>
-        
-        <textarea name="attr_hindrances"></textarea><br/>
-        <h3>Edges</h3>
-        
-        <textarea name="attr_edges"></textarea>
-        <h3>Gear</h3>
-        
-        <textarea name="attr_gear"></textarea>
-        <h3 class="sheet-horror">Psychosis</h3>
-        
-        <textarea name="attr_psychosis" class="sheet-horror"></textarea>
-	</div>
-
->>>>>>> 5bfaf82237f43034cd76b4c1e483ace6a6ba8087
 </div>
\ No newline at end of file
diff --git a/SavageWorlds/SavageWorldsDeluxe.css b/SavageWorlds/SavageWorldsDeluxe.css
index e96c79a047..de998f7f10 100644
--- a/SavageWorlds/SavageWorldsDeluxe.css
+++ b/SavageWorlds/SavageWorldsDeluxe.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .sheet-nameRankXp{
     width:50px;
 }
@@ -17,14 +16,6 @@
     display:inline-block;
     text-align:left;
     width:75px;
-=======
-.sheet-tab-content { display: none; }
-
-.sheet-isPC:checked ~ .sheet-pc,
-.sheet-isNPC:checked ~ .sheet-Im-character
-{
-    display: block;
->>>>>>> 5bfaf82237f43034cd76b4c1e483ace6a6ba8087
 }
 
 .charsheet label {
@@ -265,4 +256,4 @@ select.sheet-dtype {
 }
 .sheet-ishorror:checked~*.sheet-horror {
     display:inline-block;
-}
+}
\ No newline at end of file