Conflict resolution window

app/assets/stylesheets/app/_modals.scss

@@ -23,6 +23,26 @@
   }
 }
 
+#conflict-resolution-modal {
+  #items {
+    display: flex;
+    height: 100%;
+  }
+
+  .item {
+    width: 50%;
+    height: 100%;
+    flex-grow: 1;
+  }
+
+  .border {
+    height: 100%;
+    background-color: rgba(black, 0.1);
+    width: 1px;
+    margin: 0 15px;
+  }
+}
+
 .panel {
   background-color: white;
 }
@@ -61,6 +81,13 @@
     }
   }
 
+  &.large {
+    > .content {
+      width: 900px;
+      height: 600px;
+    }
+  }
+
   &.medium {
     > .content {
       width: 700px;