2 files changed, 7 insertions, 1 deletions
diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss
index ea40c8e99..89351c76c 100644
--- a/src/client/views/ContextMenu.scss
+++ b/src/client/views/ContextMenu.scss
@@ -7,9 +7,15 @@
 }
 
 .contextMenu-item {
+<<<<<<< HEAD
+    width: 10vw; //10vw
+    height: auto; //4vh
+    background: #DDDDDD;
+=======
     width: auto;
     height: auto;
     background: #F0F8FF;
+>>>>>>> 09928503be98d605052fba65dcd2f91f9b056f23
     display: flex;
     justify-content: left;
     align-items: center;
diff --git a/src/client/views/ContextMenu.tsx b/src/client/views/ContextMenu.tsx
index fcb934860..a947eed63 100644
--- a/src/client/views/ContextMenu.tsx
+++ b/src/client/views/ContextMenu.tsx
@@ -1,7 +1,7 @@
 import React = require("react");
 import { ContextMenuItem, ContextMenuProps } from "./ContextMenuItem";
 import { observable, action } from "mobx";
-import { observer } from "mobx-react";
+import { observer } from "mobx-react"
 import "./ContextMenu.scss"
 
 @observer