diff --git a/server.R b/server.R
index 9a0960a..ff0c4a2 100644
--- a/server.R
+++ b/server.R
@@ -525,8 +525,7 @@ shinyServer(function(input, output) {
 
     if(is.null(input$plotIndicesFOR)) return(NULL)
     
-    par(mar=rep(input$margin,4))
-    library(plotly)
+    # par(mar=rep(input$margin,4))
     
     fig <- plot_ly(
       x = dat[, input$plotIndicesFOR],
@@ -544,17 +543,13 @@ shinyServer(function(input, output) {
       yaxis = list(title = "Locus")
     )
     
-<<<<<<< HEAD
-    pdf(NULL)
-=======
-    pdf(tempfile(fileext=".pdf"))
->>>>>>> 4804b290ae4e763546e7896c69666b2a5a37bbce
-    dummy_dev_id = dev.cur()  
-    on.exit({
-      if (dummy_dev_id %in% dev.list()) {
-        dev.off(dummy_dev_id) 
-      } else warning("Dummy graphics device was closed by someone else. This should not have happened...")
-    })  
+    # pdf(NULL)
+    # dummy_dev_id = dev.cur()  
+    # on.exit({
+    #   if (dummy_dev_id %in% dev.list()) {
+    #     dev.off(dummy_dev_id) 
+    #   } else warning("Dummy graphics device was closed by someone else. This should not have happened...")
+    # })  
     (fig)
   })
   
diff --git a/ui.R b/ui.R
index 889bd7e..c55441f 100644
--- a/ui.R
+++ b/ui.R
@@ -5,6 +5,8 @@ suppressPackageStartupMessages({
   library(shinythemes)
   library(colourpicker)
   library(DT)
+  library(plotly)
+  
 })
 
 shinyUI(