glossary updates

Author: kapunahelewong

public/docs/ts/latest/glossary.jade

@@ -40,7 +40,7 @@ block includes
     ## Angular Module
   .l-sub-section
     :marked
-      Helps us organize an application into cohesive blocks of functionality.
+      Helps you organize an application into cohesive blocks of functionality.
       An Angular module identifies the components, directives, and pipes that the application uses      along with the list of external Angular modules that the application needs, such as `FormsModule`.
 
       Every Angular application has an application root module class. By convention, the class is
@@ -711,14 +711,8 @@ a#snake-case
   ## TypeScript
 .l-sub-section
   :marked
-<<<<<<< HEAD
     A version of JavaScript that supports most [ECMAScript 2015](#ecmascript=2015)
     language features such as [Decorators](#decorator).
-=======
-    A version of JavaScript that supports most [ECMAScript](#ecmascript) 2015
-    language features and many features that may arrive in future versions
-    of JavaScript such as [Decorators](#decorator).
->>>>>>> 51bcce6b1ccb188257200e6becb62f684895f30a
 
     TypeScript is also noteable for its optional typing system, which gives
     us compile-time type checking and strong tooling support (for example, "intellisense",