diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 5ba02b52f21..1f47006c17a 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -412,8 +412,12 @@
 
     // EULA check
     $.ajax({
+<<<<<<< HEAD
       url: 'eula.html',
 >>>>>>> 2e82439... Hide Citrix logo if no EULA is present (i.e., is OSS version)
+=======
+      url: 'eula.' + $.cookie('lang') + '.html',
+>>>>>>> 4f35fb7... Get EULA specific to selected language
       dataType: 'html',
       success: function(html) {
         cloudStack.uiCustom.login($.extend(loginArgs, { eula: html, hasLogo: true }));