fixed the merge conflic

src/main/java/io/zipcoder/casino/Dice.java

@@ -0,0 +1,38 @@
+package io.zipcoder.casino;
+
+import java.util.Random;
+
+    public class Dice
+    {
+        private int dice;
+        private Random randomGenerator;
+
+        public Dice(int numberOfDice)
+        {
+            dice = numberOfDice;
+        }
+
+        public int getSum()
+        {
+            int sumOfTosses = 0;
+            for (int i=0; i<dice; i++)
+            {
+                randomGenerator = new Random();
+                int resultOfToss = randomGenerator.nextInt(6)+1;
+                sumOfTosses += resultOfToss;
+            }
+            return sumOfTosses;
+        }
+
+        public int[] getEach()
+        {
+            int[] tosses = new int[dice];
+            for (int i=0; i<dice; i++)
+            {
+                randomGenerator = new Random();
+                tosses[i] = randomGenerator.nextInt(6)+1;
+            }
+            return tosses;
+        }
+    }
+

src/test/java/io/zipcoder/casino/DiceTest.java

@@ -0,0 +1,40 @@
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DiceTest {
+
+    @Test
+    public void getSum1(){
+        Dice dice = new Dice(2);
+        int expected = 6;
+        int actual = dice.getSum();
+        Assert.assertEquals(expected, actual, 6);
+    }
+
+    @Test
+    public void getSum2(){
+        Dice dice = new Dice(5);
+        int expected = 13;
+        int actual = dice.getSum();
+        Assert.assertEquals(expected, actual, 12);
+    }
+
+    @Test
+    public void getEach1(){
+        Dice dice = new Dice(2);
+        int expected = 3;
+        int actual = dice.getEach()[1];
+        Assert.assertEquals(expected, actual, 3);
+    }
+
+    @Test
+    public void getEach2(){
+        Dice dice = new Dice(6);
+        int expected = 3;
+        int actual = dice.getEach()[3];
+        Assert.assertEquals(expected, actual, 3);
+    }
+}