fixed merge conflicts

Author: Vargas Gonzalez, Patricio

3rdpartylicenses.txt

@@ -365,4 +365,4 @@ If the Work includes a "NOTICE" text file as part of its distribution, then any
 
 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
 
-END OF TERMS AND CONDITIONS
+END OF TERMS AND CONDITIONS

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman