diff --git a/client/projects/angular-editor-fabric-js/src/lib/angular-editor-fabric-js.component.ts b/client/projects/angular-editor-fabric-js/src/lib/angular-editor-fabric-js.component.ts
index 731f06a..d6e6554 100644
--- a/client/projects/angular-editor-fabric-js/src/lib/angular-editor-fabric-js.component.ts
+++ b/client/projects/angular-editor-fabric-js/src/lib/angular-editor-fabric-js.component.ts
@@ -597,10 +597,42 @@ export class FabricjsEditorComponent implements AfterViewInit {
     localStorage.setItem('Kanvas', json);
     console.log('json');
     console.log(json);
-
   }
 
+<<<<<<< Updated upstream
   loadCanvasFromJSON() {
+=======
+  changeCanvas() {
+    // this.canvas = JSON.parse(localStorage.getItem("Kanvas"));
+    this.loadCanvasFromJSON();
+  }
+
+  loadCanvasFromJsonObject(object: JSON) {
+    this.canvas.loadFromJSON(object, () => { this.canvas.renderAll(); })
+  }
+  public loadCanvasFromJSON2() {
+    const CANVAS = localStorage.getItem('Kanva');
+    // console.log('CANVAS');
+    // console.log(CANVAS);
+
+    // and load everything from the same json
+    this.canvas2.loadFromJSON(CANVAS, () => {
+      // console.log('CANVAS untar');
+      // console.log(CANVAS);
+
+      // making sure to render canvas at the end
+      this.canvas2.renderAll();
+
+      // and checking if object's "name" is preserved
+      // console.log('this.canvas.item(0).name');
+      // console.log(this.canvas);
+      console.log("loading");
+    });
+
+  }
+
+   public loadCanvasFromJSON() {
+>>>>>>> Stashed changes
     const CANVAS = localStorage.getItem('Kanvas');
     console.log('CANVAS');
     console.log(CANVAS);
diff --git a/client/src/app/Components/editor/editor.component.ts b/client/src/app/Components/editor/editor.component.ts
index 9b11cdb..627b0f5 100644
--- a/client/src/app/Components/editor/editor.component.ts
+++ b/client/src/app/Components/editor/editor.component.ts
@@ -37,6 +37,7 @@ export class EditorComponent implements OnInit {
     this.canvas.rasterize();
   }
 
+<<<<<<< Updated upstream
   public rasterizePDF(){
     var __CANVAS = document.getElementById('canvas');
     let width = __CANVAS.clientWidth; 
@@ -56,6 +57,8 @@ export class EditorComponent implements OnInit {
     pdf.addImage(__CANVAS, 'PNG', 0, 0,width,height);
     pdf.save("download.pdf");
   }
+=======
+>>>>>>> Stashed changes
 
   public rasterizeSVG() {
     this.canvas.rasterizeSVG();
@@ -67,7 +70,13 @@ export class EditorComponent implements OnInit {
 
   public loadCanvasFromJSON() {
     this.canvas.loadCanvasFromJSON();
+<<<<<<< Updated upstream
   }
+=======
+    // this.canvas.changeCanvas();
+  }
+
+>>>>>>> Stashed changes
 
   public confirmClear() {
     this.canvas.confirmClear();
@@ -184,5 +193,180 @@ export class EditorComponent implements OnInit {
   public drawMode() {
     this.canvas.drawingMode();
   }
+<<<<<<< Updated upstream
+=======
+
+  public tempEmail() {
+    this._service.getObj(localStorage.getItem("Current")).subscribe(
+      data => {
+        // console.log(data)
+        this.mailSender(data);
+      },
+      error => {
+        console.log(error)
+      }
+    )
+  }
+
+  public loadCanvasFromJSON2() {
+    console.log("load canvas");
+    this.canvas.loadCanvasFromJSON2();
+    // callback();
+    // await setTimeout(() => {
+    //   this.rasterizePDF();
+    // }, 1000);
+  }
+  public rasterizePDF() {
+    var __CANVAS = document.getElementById('canvas2');
+    let width = __CANVAS.clientWidth;
+    let height = __CANVAS.clientHeight;
+    // console.log(height, width);
+    let pdf;
+    // let pdf = new jsPDF('portrait','px',[height, width]);
+    //set the orientation
+    if (width > height) {
+      pdf = new jsPDF('l', 'px', [width, height]);
+    }
+    else {
+      pdf = new jsPDF('p', 'px', [height, width]);
+    }
+    //then we get the dimensions from the 'pdf' file itself
+    width = pdf.internal.pageSize.getWidth();
+    height = pdf.internal.pageSize.getHeight();
+    pdf.addImage(__CANVAS, 'PNG', 0, 0, width, height);
+    // return pdf.output('datauristring');
+    // console.log(this.pdfObject);
+    pdf.save("download.pdf");
+    console.log("pdf");
+    // let canv = <HTMLCanvasElement> document.getElementById('canvas');
+    // var imgData = canv.toDataURL("image/jpeg", 1.0);
+    // var pdf = new jsPDF();
+    // console.log(imgData);
+    // let width = canv.clientWidth; 
+    // let height = canv.clientHeight;
+    // pdf.addImage(imgData, 'JPEG', 0, 0, width, height);
+    // pdf.save("download.pdf");
+  }
+  public mailSender(data: any) {
+    data.forEach(async i => {
+      // console.log(i["tempObj"]);
+      // console.log("gmail", i["gmail"]);
+      const tempObj: JSON = JSON.parse(i["tempObj"]);
+      // console.log(tempObj);
+      localStorage.setItem('Kanva', JSON.stringify(tempObj));
+      this.loadCanvasFromJSON2();
+      // .then(
+      //   ()=>{
+      //     this.rasterizePDF();
+      //   }
+      // )
+      console.log("loop");
+      // await setTimeout(() => {
+      //   // this.rasterizePDF();
+      // }, 1000);
+      // let vempObj = {};
+      // vempObj["email"] = i["gmail"];
+      // vempObj["pdf"] = this.rasterizePDF();
+      // this.jsonObj.push(vempObj);
+      // await this.sendMail(i["gmail"]);
+
+      // this.loadCanvasFromJSON2();
+      // this.sendMail(i["gmail"]);
+      // console.log("object",i["tempObj"]);
+    });
+    // this.sendMail(this.jsonObj);
+  }
+
+
+  public sendMail(jsonObj: any) {
+    console.log(this.jsonObj);
+    if (this.jsonObj[0].pdf === this.jsonObj[1].pdf) {
+      console.log("same pdf");
+    } else {
+      console.log("different pdf");
+    }
+    this.jsonObj.forEach(element => {
+      Email.send({
+        SecureToken: "your secure token",
+        To: element.email,
+        From: "sender mail",
+        Subject: "This is changed",
+        Body: "And this is the offer letter attached",
+        Attachments: [
+          {
+            name: "OfferLetter.pdf",
+            data: element.pdf
+            // path : ""
+          }]
+      }).then(
+        message => alert(message)
+      );
+    });
+  }
+
+  public saveTemplate() {
+    this.saveCanvasToJSON();
+    const temp = new Template("", localStorage.getItem("Kanvas"), this.title, new Date);
+    this._service.saveTemplate(temp).subscribe(
+      data => console.log(data),
+      error => console.log(error)
+    )
+  }
+
+  public updateTemplate() {
+    this.saveCanvasToJSON();
+    const temp = new Template("", localStorage.getItem('Kanvas'), this.template.name, new Date);
+    this._service.updateTemplate(localStorage.getItem('Current'), temp).subscribe(
+      data => {
+        console.log(data)
+      },
+      error => { console.log(error) }
+    )
+  }
+
+  // temp = this.loadCanvasFromJSON();
+
+  // // toggle modal logic
+  // public toggleModal() {
+  //   if (document.getElementById("mailModal").style.display == "flex") {
+  //     document.getElementById("mailModal").style.display = "none";
+  //   }
+  //   else
+  //     document.getElementById("mailModal").style.display = "flex";
+  // }
+
+  // // select candidates section
+
+  // // candidates list
+  // selectAllCandidates: boolean = false;
+  // candidates: any[] = [
+  //   { id: 1, name: 'Candidate 1', selected: false },
+  //   { id: 2, name: 'Candidate 2', selected: false },
+  //   { id: 3, name: 'Candidate 3', selected: false }
+  // ];
+
+  // // select logic
+  // selectAllItems() {
+  //   for (let candidate of this.candidates) {
+  //     candidate.selected = this.selectAllCandidates;
+  //   }
+  // }
+
+  // // select template
+  // public selectedValue: string;
+  // // template list
+  // public templates: any[] = [
+  //   { value: 'Template 1' },
+  //   { value: 'Template 2' },
+  //   { value: 'Template 3' },
+  // ]
+
+  // navigate to candidate selection
+  public gotoCandidates() {
+    this._router.navigate(['/candidate']);
+  }
+
+  m
+>>>>>>> Stashed changes
 }