Merge changes with master

Author: gguuss

language/analysis/README.md

@@ -34,7 +34,7 @@ three values `entities`, `sentiment` or `syntax`.
 
 ```
 MAIN_CLASS=com.google.cloud.language.samples.Analyze
-JAR_FILE=target/entities-1.0-SNAPSHOT-jar-with-dependencies.jar
+JAR_FILE=target/language-entities-1.0-SNAPSHOT-jar-with-dependencies.jar
 java -cp $JAR_FILE $MAIN_CLASS <sentiment|entities|syntax> <text>
 ```
 

language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java

@@ -220,16 +220,9 @@ public List<Token> analyzeSyntax(String text) throws IOException {
         new AnalyzeSyntaxRequest()
             .setDocument(new Document().setContent(text).setType("PLAIN_TEXT"))
             .setEncodingType("UTF16");
-<<<<<<< HEAD
     CloudNaturalLanguage.Documents.AnalyzeSyntax analyze =
         languageApi.documents().analyzeSyntax(request);
     AnalyzeSyntaxResponse response = analyze.execute();
-=======
-    CloudNaturalLanguage.Documents.AnnotateText analyze =
-        languageApi.documents().annotateText(request);
-
-    AnnotateTextResponse response = analyze.execute();
->>>>>>> 4d98005d3073deafb0903bebdd1ad3fb5d247238
     return response.getTokens();
   }
 }