Finally think I am through with Merge Issues

html/load_personal_history_dialog.html

@@ -4,22 +4,15 @@
 
 <div class="title-bar translate" data-i18n='fhh_load_save.load_from_file'> Load Your Personal Information from a File</div>
 <br /> <br />
-<<<<<<< ours
-=======
 <!--
 <hr>
 <h3>Old Way</h3>
->>>>>>> theirs
 <form action="#" enctype="multipart/form-data" method="post"  >
   <input name="pedigree_file" type="file" id='pedigree_file' accept='text/xml' />
   <input type="submit" value="Load File" id='file_upload_button' />
 </form>
-<<<<<<< ours
-=======
 <br />
 <hr>
--->
->>>>>>> theirs
 <!-- PL Uploader -->
 <div id="filelist">Your browser doesn't have Flash, Silverlight or HTML5 support.</div>