diff --git a/tomcat/webapps/Trawl/WEB-INF/web.xml b/tomcat/webapps/Trawl/WEB-INF/web.xml
index 168be2573821f76b58ae245bbf6703621355cda5..dc7d6ca231cc2439744237d61062a4a5984953cf 100644
--- a/tomcat/webapps/Trawl/WEB-INF/web.xml
+++ b/tomcat/webapps/Trawl/WEB-INF/web.xml
@@ -9,24 +9,6 @@
         <servlet-class>web.Director</servlet-class>
     </servlet>
 
-    <servlet-mapping>
-        <servlet-name>Trawl</servlet-name>
-        <url-pattern>/doBioLookup.do</url-pattern>
-        <url-pattern>/doHist.do</url-pattern>
-        <url-pattern>/doMap.do</url-pattern>
-    </servlet-mapping>
-=======
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-    <servlet>
-        <servlet-name>Trawl</servlet-name>
-        <servlet-class>web.Director</servlet-class>
-    </servlet>
-
     <servlet-mapping>
         <servlet-name>Trawl</servlet-name>
         <url-pattern>/doBioLookup.do</url-pattern>
diff --git a/tomcat/webapps/Trawl/infoWindow.js b/tomcat/webapps/Trawl/infoWindow.js
index 69cb16c750862f436614f2808c6541764b5a5cbc..279f95ace2bc4713bbbd84b01f22563fdad371f4 100644
--- a/tomcat/webapps/Trawl/infoWindow.js
+++ b/tomcat/webapps/Trawl/infoWindow.js
@@ -5,14 +5,7 @@
 // When the user clicks the marker, an info window opens
 var openWindow;
 
-<<<<<<< HEAD
 function initInfo(lati, longi,name, date, individualCount) {
-=======
-
-
-function initInfo(lati, longi,name, date, count ) {
-	console.log("Trying to gen. info map");
->>>>>>> origin/web
     // Generate map centred at Great Lakes
     var map = new google.maps.Map(document.getElementById('map'), {
         zoom: 5.5,
diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js
index f725ea469d6b102c8d95dfe7cd5bcf32afca93c0..7361e425dc5e845e6ffa6f82e4b2b736dd6b04d8 100644
--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js
@@ -1,5 +1,6 @@
 // Initialization
 function init() {
+    console.log("trying to init");
     callUpdateSci({id:"pickAnimalia", value:2});    // Propagate Dropdowns on Startup
     reqHistogram(2);
 }
@@ -280,3 +281,4 @@ $( function() {
     $( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
 } );
 
+window.onload = init;
\ No newline at end of file