diff --git a/lib/WebGUI/Form/Textarea.pm b/lib/WebGUI/Form/Textarea.pm
index 105288962..f3e3b651a 100644
--- a/lib/WebGUI/Form/Textarea.pm
+++ b/lib/WebGUI/Form/Textarea.pm
@@ -198,17 +198,7 @@ sub toHtml {
 </script>
 END_HTML
     }
-<<<<<<< HEAD
-    elsif ($self->get('maxlength')) {
-        $style->setScript( $url->extras( 'yui/build/yahoo-dom-event/yahoo-dom-event.js' ));
-    }
-    if ($self->get('maxlength')) {
-        # Add the maxlength script
-        $style->setScript( $url->extras( 'yui-webgui/build/form/textarea.js' ));
-    }
-=======
     $self->headTags;
->>>>>>> Convert Textarea over to headTags
     return $out;
 }
 
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 922d4d93f..e2bacdb9c 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -153,6 +153,7 @@ sub cache {
         $self->{_cache} = $cache;
     }
     return $self->{_cache};
+}
 
 #-------------------------------------------------------------------