diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index 5b715bc..c2671ba 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -13,7 +13,16 @@ function clearDefaultContent(element, text) {
 
 function clearDataField(){
     document.getElementById("xmlArea").value = "";
+<<<<<<< HEAD
     document.getElementById("transformArea").value = "";
+=======
+    document.getElementById("xmlArea").style.color = null;
+    document.getElementById("xmlArea").style.backgroundColor = null;
+    
+    document.getElementById("transformArea").value = "";
+    document.getElementById("transformArea").style.color = null;
+    document.getElementById("transformArea").style.backgroundColor = null;
+>>>>>>> dev
 }
 
 function fillDefaultXML(element) {
@@ -29,7 +38,7 @@ function fillDefaultXML(element) {
         }
 
 //Set default text in grey
-function setDefaultContent(element, text) {
+function setDefaultContent(element, text) {6543
     if (element.value == "") {
         var id = element.getAttribute('id');
         if (!defaultStrings.includes(text)) {
@@ -103,12 +112,23 @@ function refreshTooltip() {
 
 
 function performRequest(endpoint, checkXML, checkTransform){
+<<<<<<< HEAD
     var xmlData = document.getElementById(sourceId).value.trim();
     var transformData = document.getElementById(targetId).value.trim();
     
     var port = 8081
     if (getProcessor() == "libxml") {
         port = 8082
+=======
+    const sourceId = "xmlArea";
+    const transformId = "transformArea";
+    var xmlData = document.getElementById(sourceId).value.trim();
+    var transformData = document.getElementById(transformId).value.trim();
+    
+    var port = 8081;
+    if (getProcessor() == "libxml") {
+        port = 8082;
+>>>>>>> dev
     }
 
     var empty = false;
@@ -118,11 +138,21 @@ function performRequest(endpoint, checkXML, checkTransform){
             empty = true;
     }
     if (defaultStrings.includes(transformData) && checkTransform) {
+<<<<<<< HEAD
         document.getElementById(targetId).style.backgroundColor = color_red;
+=======
+        document.getElementById(transformId).style.backgroundColor = color_red;
+>>>>>>> dev
         empty = true;
     }
     if (!empty) {
         restRequest(port, endpoint, xmlData, transformData).then(function(result) {
+<<<<<<< HEAD
+=======
+            console.log(xmlData);
+            console.log(transformData);
+
+>>>>>>> dev
             document.getElementById("resultArea").value = result.result;
             document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
             if (result.status = "OK") {
@@ -152,12 +182,20 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){
 
     if (!empty) {
         restRequest(port, endpoint, xmlData, "").then(function(result) {
+<<<<<<< HEAD
             document.getElementById(targetId).value = result.result;
             
         });
     }else{
         document.getElementById(targetId).value = "No data provided!";
         return false;
+=======
+            if (result.status == "OK") {
+                document.getElementById(targetId).value = result.result;
+            }
+            
+        });
+>>>>>>> dev
     }
     
 }