Not officially supported Google product

jdahmubed · jdahmubed · commit b82871ac1267 · 2017-12-12T17:03:37.000-08:00
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
 the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 
+<<<<<<< HEAD
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
@@ -19,6 +20,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 # JWTs for Java 
+=======
+# Java JWT 
+>>>>>>> Not officially supported Google product
 This is not an officially supported Google product
 
 [![CircleCI](https://img.shields.io/circleci/project/github/auth0/java-jwt.svg?style=flat-square)](https://circleci.com/gh/auth0/java-jwt/tree/master)
